Moved call.h and most of api/call/* into call/
BUG=webrtc:6716
Review-Url: https://codereview.webrtc.org/2550273003
Cr-Commit-Position: refs/heads/master@{#15460}
diff --git a/webrtc/audio/BUILD.gn b/webrtc/audio/BUILD.gn
index bde074d..bfc2372 100644
--- a/webrtc/audio/BUILD.gn
+++ b/webrtc/audio/BUILD.gn
@@ -30,8 +30,8 @@
deps = [
"..:webrtc_common",
"../api:audio_mixer_api",
- "../api:call_api",
"../base:rtc_base_approved",
+ "../call:call_interfaces",
"../common_audio",
"../modules/audio_device",
"../modules/audio_processing",
diff --git a/webrtc/audio/audio_receive_stream.h b/webrtc/audio/audio_receive_stream.h
index 3bba54e..7dfc5d6 100644
--- a/webrtc/audio/audio_receive_stream.h
+++ b/webrtc/audio/audio_receive_stream.h
@@ -14,11 +14,11 @@
#include <memory>
#include "webrtc/api/audio/audio_mixer.h"
-#include "webrtc/api/call/audio_receive_stream.h"
-#include "webrtc/api/call/audio_state.h"
#include "webrtc/audio/audio_state.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/base/thread_checker.h"
+#include "webrtc/call/audio_receive_stream.h"
+#include "webrtc/call/audio_state.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
namespace webrtc {
diff --git a/webrtc/audio/audio_send_stream.h b/webrtc/audio/audio_send_stream.h
index 23a7485..de1cf82 100644
--- a/webrtc/audio/audio_send_stream.h
+++ b/webrtc/audio/audio_send_stream.h
@@ -13,10 +13,10 @@
#include <memory>
-#include "webrtc/api/call/audio_send_stream.h"
-#include "webrtc/api/call/audio_state.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/base/thread_checker.h"
+#include "webrtc/call/audio_send_stream.h"
+#include "webrtc/call/audio_state.h"
#include "webrtc/call/bitrate_allocator.h"
namespace webrtc {
diff --git a/webrtc/audio/audio_state.h b/webrtc/audio/audio_state.h
index 307f5ce..29b5a9e 100644
--- a/webrtc/audio/audio_state.h
+++ b/webrtc/audio/audio_state.h
@@ -11,12 +11,12 @@
#ifndef WEBRTC_AUDIO_AUDIO_STATE_H_
#define WEBRTC_AUDIO_AUDIO_STATE_H_
-#include "webrtc/api/call/audio_state.h"
#include "webrtc/audio/audio_transport_proxy.h"
#include "webrtc/audio/scoped_voe_interface.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/base/criticalsection.h"
#include "webrtc/base/thread_checker.h"
+#include "webrtc/call/audio_state.h"
#include "webrtc/voice_engine/include/voe_base.h"
namespace webrtc {