Revert of Delete empty API files and cleaned up includes. (patchset #2 id:20001 of https://codereview.webrtc.org/1809053002/ )
Reason for revert:
Breaks Chromium build. Need to remove the references to the obsolete header files from Chromium and reland.
Original issue's description:
> Delete empty API files and cleaned up includes.
>
> TBR=glaznev@webrtc.org
>
> BUG=webrtc:5426
>
> Committed: https://crrev.com/c9022f508644dc33c01b05cb22ebfc2be145d6b2
> Cr-Commit-Position: refs/heads/master@{#12039}
TBR=nisse@webrtc.org,glaznev@webrtc.org,perkj@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:5426
Review URL: https://codereview.webrtc.org/1813083002
Cr-Original-Commit-Position: refs/heads/master@{#12042}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 246b5273986d5a5b140b3d1a656baa8d40c36276
diff --git a/api/api.gyp b/api/api.gyp
index aa6ef38..1256a83 100644
--- a/api/api.gyp
+++ b/api/api.gyp
@@ -299,6 +299,8 @@
'proxy.h',
'remoteaudiosource.cc',
'remoteaudiosource.h',
+ 'remotevideocapturer.cc',
+ 'remotevideocapturer.h',
'rtpparameters.h',
'rtpreceiver.cc',
'rtpreceiver.h',
@@ -315,6 +317,7 @@
'streamcollection.h',
'videocapturertracksource.cc',
'videocapturertracksource.h',
+ 'videosourceinterface.h',
'videosourceproxy.h',
'videotrack.cc',
'videotrack.h',
diff --git a/api/java/jni/peerconnection_jni.cc b/api/java/jni/peerconnection_jni.cc
index 74fb473..d614ed6 100644
--- a/api/java/jni/peerconnection_jni.cc
+++ b/api/java/jni/peerconnection_jni.cc
@@ -55,6 +55,7 @@
#include "webrtc/api/peerconnectioninterface.h"
#include "webrtc/api/rtpreceiverinterface.h"
#include "webrtc/api/rtpsenderinterface.h"
+#include "webrtc/api/videosourceinterface.h"
#include "webrtc/api/webrtcsdp.h"
#include "webrtc/base/bind.h"
#include "webrtc/base/checks.h"
diff --git a/api/objc/RTCVideoSource+Private.h b/api/objc/RTCVideoSource+Private.h
index 7746ba5..be064bd 100644
--- a/api/objc/RTCVideoSource+Private.h
+++ b/api/objc/RTCVideoSource+Private.h
@@ -10,7 +10,7 @@
#import "RTCVideoSource.h"
-#include "webrtc/api/mediastreaminterface.h"
+#include "webrtc/api/videosourceinterface.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/api/peerconnection.cc b/api/peerconnection.cc
index 691a512..54e76d4 100644
--- a/api/peerconnection.cc
+++ b/api/peerconnection.cc
@@ -25,6 +25,7 @@
#include "webrtc/api/mediastreamproxy.h"
#include "webrtc/api/mediastreamtrackproxy.h"
#include "webrtc/api/remoteaudiosource.h"
+#include "webrtc/api/remotevideocapturer.h"
#include "webrtc/api/rtpreceiver.h"
#include "webrtc/api/rtpsender.h"
#include "webrtc/api/streamcollection.h"
diff --git a/api/peerconnection_unittest.cc b/api/peerconnection_unittest.cc
index c6e51a6..dcffd13 100644
--- a/api/peerconnection_unittest.cc
+++ b/api/peerconnection_unittest.cc
@@ -29,6 +29,7 @@
#include "webrtc/api/test/fakeperiodicvideocapturer.h"
#include "webrtc/api/test/fakevideotrackrenderer.h"
#include "webrtc/api/test/mockpeerconnectionobservers.h"
+#include "webrtc/api/videosourceinterface.h"
#include "webrtc/base/gunit.h"
#include "webrtc/base/physicalsocketserver.h"
#include "webrtc/base/scoped_ptr.h"
diff --git a/api/peerconnectionfactory_unittest.cc b/api/peerconnectionfactory_unittest.cc
index 254e4e0..2165937 100644
--- a/api/peerconnectionfactory_unittest.cc
+++ b/api/peerconnectionfactory_unittest.cc
@@ -18,6 +18,7 @@
#endif
#include "webrtc/api/test/fakedtlsidentitystore.h"
#include "webrtc/api/test/fakevideotrackrenderer.h"
+#include "webrtc/api/videosourceinterface.h"
#include "webrtc/base/gunit.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/thread.h"
diff --git a/api/remotevideocapturer.cc b/api/remotevideocapturer.cc
new file mode 100644
index 0000000..177ba54
--- /dev/null
+++ b/api/remotevideocapturer.cc
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2013 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "webrtc/api/remotevideocapturer.h"
+
+// TODO(perkj): Remove this file once Chrome gyp file doesn't depend on it.
diff --git a/api/remotevideocapturer.h b/api/remotevideocapturer.h
new file mode 100644
index 0000000..774cb5a
--- /dev/null
+++ b/api/remotevideocapturer.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2013 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_API_REMOTEVIDEOCAPTURER_H_
+#define WEBRTC_API_REMOTEVIDEOCAPTURER_H_
+
+// TODO(perkj): Remove this file once Chrome gyp file doesn't depend on it.
+
+#endif // WEBRTC_API_REMOTEVIDEOCAPTURER_H_
diff --git a/api/rtpsender.cc b/api/rtpsender.cc
index a753786..1e28883 100644
--- a/api/rtpsender.cc
+++ b/api/rtpsender.cc
@@ -11,7 +11,7 @@
#include "webrtc/api/rtpsender.h"
#include "webrtc/api/localaudiosource.h"
-#include "webrtc/api/mediastreaminterface.h"
+#include "webrtc/api/videosourceinterface.h"
#include "webrtc/base/helpers.h"
namespace webrtc {
diff --git a/api/test/peerconnectiontestwrapper.cc b/api/test/peerconnectiontestwrapper.cc
index 2ff9b5d..353f0ee 100644
--- a/api/test/peerconnectiontestwrapper.cc
+++ b/api/test/peerconnectiontestwrapper.cc
@@ -14,6 +14,7 @@
#include "webrtc/api/test/fakeperiodicvideocapturer.h"
#include "webrtc/api/test/mockpeerconnectionobservers.h"
#include "webrtc/api/test/peerconnectiontestwrapper.h"
+#include "webrtc/api/videosourceinterface.h"
#include "webrtc/base/gunit.h"
#include "webrtc/p2p/client/fakeportallocator.h"
diff --git a/api/videocapturertracksource_unittest.cc b/api/videocapturertracksource_unittest.cc
index 1a9d3ac..0a06870 100644
--- a/api/videocapturertracksource_unittest.cc
+++ b/api/videocapturertracksource_unittest.cc
@@ -11,6 +11,7 @@
#include <string>
#include <vector>
+#include "webrtc/api/remotevideocapturer.h"
#include "webrtc/api/test/fakeconstraints.h"
#include "webrtc/api/videocapturertracksource.h"
#include "webrtc/base/gunit.h"
diff --git a/api/videosource.cc b/api/videosource.cc
new file mode 100644
index 0000000..08e5422
--- /dev/null
+++ b/api/videosource.cc
@@ -0,0 +1,11 @@
+/*
+ * Copyright 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+// TODO(perkj): Remove this file once Chrome build files doesn't depend on it.
diff --git a/api/videosource.h b/api/videosource.h
new file mode 100644
index 0000000..08e5422
--- /dev/null
+++ b/api/videosource.h
@@ -0,0 +1,11 @@
+/*
+ * Copyright 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+// TODO(perkj): Remove this file once Chrome build files doesn't depend on it.
diff --git a/api/videosourceinterface.h b/api/videosourceinterface.h
new file mode 100644
index 0000000..10ded41
--- /dev/null
+++ b/api/videosourceinterface.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_API_VIDEOSOURCEINTERFACE_H_
+#define WEBRTC_API_VIDEOSOURCEINTERFACE_H_
+
+#include "webrtc/api/mediastreaminterface.h"
+
+// TODO(perkj): Remove this file once Chrome build files doesn't depend on it.
+
+#endif // WEBRTC_API_VIDEOSOURCEINTERFACE_H_
diff --git a/api/videosourceproxy.h b/api/videosourceproxy.h
index ecd0e83..c251b36 100644
--- a/api/videosourceproxy.h
+++ b/api/videosourceproxy.h
@@ -12,7 +12,7 @@
#define WEBRTC_API_VIDEOSOURCEPROXY_H_
#include "webrtc/api/proxy.h"
-#include "webrtc/api/mediastreaminterface.h"
+#include "webrtc/api/videosourceinterface.h"
namespace webrtc {
diff --git a/api/videotrack.h b/api/videotrack.h
index 36b03b8..57bc42f 100644
--- a/api/videotrack.h
+++ b/api/videotrack.h
@@ -15,6 +15,8 @@
#include <vector>
#include "webrtc/api/mediastreamtrack.h"
+#include "webrtc/api/videosourceinterface.h"
+#include "webrtc/api/videotrackrenderers.h"
#include "webrtc/base/scoped_ref_ptr.h"
#include "webrtc/base/thread_checker.h"
#include "webrtc/media/base/videosourcebase.h"
diff --git a/api/videotrackrenderers.cc b/api/videotrackrenderers.cc
new file mode 100644
index 0000000..a19bc33
--- /dev/null
+++ b/api/videotrackrenderers.cc
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "webrtc/api/videotrackrenderers.h"
+
+// TODO(perkj): Remove this file once Chrome builds doesnt depend on it.
diff --git a/api/videotrackrenderers.h b/api/videotrackrenderers.h
new file mode 100644
index 0000000..9c8fcac
--- /dev/null
+++ b/api/videotrackrenderers.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef WEBRTC_API_VIDEOTRACKRENDERERS_H_
+#define WEBRTC_API_VIDEOTRACKRENDERERS_H_
+
+// TODO(perkj): Remove this file once Chrome builds doesnt depend on it.
+
+#endif // WEBRTC_API_VIDEOTRACKRENDERERS_H_
diff --git a/api/videotracksource.h b/api/videotracksource.h
index 78577aa..5e2437c 100644
--- a/api/videotracksource.h
+++ b/api/videotracksource.h
@@ -11,8 +11,8 @@
#ifndef WEBRTC_API_VIDEOTRACKSOURCE_H_
#define WEBRTC_API_VIDEOTRACKSOURCE_H_
-#include "webrtc/api/mediastreaminterface.h"
#include "webrtc/api/notifier.h"
+#include "webrtc/api/videosourceinterface.h"
#include "webrtc/media/base/mediachannel.h"
#include "webrtc/media/base/videosinkinterface.h"
diff --git a/examples/peerconnection/client/conductor.cc b/examples/peerconnection/client/conductor.cc
index e26d403..ca07ef3 100644
--- a/examples/peerconnection/client/conductor.cc
+++ b/examples/peerconnection/client/conductor.cc
@@ -13,6 +13,7 @@
#include <utility>
#include <vector>
+#include "webrtc/api/videosourceinterface.h"
#include "webrtc/api/test/fakeconstraints.h"
#include "webrtc/base/common.h"
#include "webrtc/base/json.h"
diff --git a/media/base/capturemanager.cc b/media/base/capturemanager.cc
new file mode 100644
index 0000000..2824184
--- /dev/null
+++ b/media/base/capturemanager.cc
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "webrtc/media/base/capturemanager.h"
+
+// TODO(perkj): Remove this file once Chrome's gyp file doesn't depend on it.
diff --git a/media/base/capturemanager.h b/media/base/capturemanager.h
new file mode 100644
index 0000000..8d27d82
--- /dev/null
+++ b/media/base/capturemanager.h
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+// TODO(perkj): Remove this file once Chrome's gyp file doesn't depend on it.
diff --git a/media/base/capturerenderadapter.cc b/media/base/capturerenderadapter.cc
new file mode 100644
index 0000000..4eb738b
--- /dev/null
+++ b/media/base/capturerenderadapter.cc
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+// TODO(perkj): Remove this dummy file once Chrome is not depending on it.
diff --git a/media/base/capturerenderadapter.h b/media/base/capturerenderadapter.h
new file mode 100644
index 0000000..4eb738b
--- /dev/null
+++ b/media/base/capturerenderadapter.h
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+// TODO(perkj): Remove this dummy file once Chrome is not depending on it.
diff --git a/media/media.gyp b/media/media.gyp
index 3cddf1e..d9d57e1 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -32,6 +32,8 @@
'sources': [
'base/audioframe.h',
'base/audiosource.h',
+ 'base/capturemanager.cc',
+ 'base/capturemanager.h',
'base/codec.cc',
'base/codec.h',
'base/cpuid.cc',
