Delete empty API files and cleaned up includes.

TBR=glaznev@webrtc.org BUG=webrtc:5426 Review URL: https://codereview.webrtc.org/1809053002 Cr-Commit-Position: refs/heads/master@{#12039}
2016-03-17 09:57:28 -07:00 · 2016-03-17 09:57:28 -07:00 · c9022f5086
commit c9022f5086
parent 8811b35960
28 changed files with 6 additions and 165 deletions
--- a/talk/app/webrtc/objc/RTCPeerConnectionFactory.mm
+++ b/talk/app/webrtc/objc/RTCPeerConnectionFactory.mm
@ -50,7 +50,6 @@
 #include "webrtc/api/audiotrack.h"
 #include "webrtc/api/mediastreaminterface.h"
 #include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/api/videosourceinterface.h"
 #include "webrtc/api/videotrack.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/ssladapter.h"
--- a/talk/app/webrtc/objc/RTCVideoCapturer+Internal.h
+++ b/talk/app/webrtc/objc/RTCVideoCapturer+Internal.h
@ -27,7 +27,7 @@

 #import "RTCVideoCapturer.h"

-#include "webrtc/api/videosourceinterface.h"
+#include "webrtc/api/mediastreaminterface.h"

@interface RTCVideoCapturer (Internal)

--- a/talk/app/webrtc/objc/RTCVideoSource+Internal.h
+++ b/talk/app/webrtc/objc/RTCVideoSource+Internal.h
@ -27,7 +27,7 @@

 #import "RTCVideoSource.h"

-#include "webrtc/api/videosourceinterface.h"
+#include "webrtc/api/mediastreaminterface.h"

@interface RTCVideoSource (Internal)

--- a/webrtc/api/api.gyp
+++ b/webrtc/api/api.gyp
@ -299,8 +299,6 @@
        'proxy.h',
        'remoteaudiosource.cc',
        'remoteaudiosource.h',
-        'remotevideocapturer.cc',
-        'remotevideocapturer.h',
        'rtpparameters.h',
        'rtpreceiver.cc',
        'rtpreceiver.h',
@ -317,7 +315,6 @@
        'streamcollection.h',
        'videocapturertracksource.cc',
        'videocapturertracksource.h',
-        'videosourceinterface.h',
        'videosourceproxy.h',
        'videotrack.cc',
        'videotrack.h',
--- a/webrtc/api/java/jni/peerconnection_jni.cc
+++ b/webrtc/api/java/jni/peerconnection_jni.cc
@ -55,7 +55,6 @@
 #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"
--- a/webrtc/api/objc/RTCVideoSource+Private.h
+++ b/webrtc/api/objc/RTCVideoSource+Private.h
@ -10,7 +10,7 @@

 #import "RTCVideoSource.h"

-#include "webrtc/api/videosourceinterface.h"
+#include "webrtc/api/mediastreaminterface.h"

 NS_ASSUME_NONNULL_BEGIN

--- a/webrtc/api/peerconnection.cc
+++ b/webrtc/api/peerconnection.cc
@ -25,7 +25,6 @@
 #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"
--- a/webrtc/api/peerconnection_unittest.cc
+++ b/webrtc/api/peerconnection_unittest.cc
@ -29,7 +29,6 @@
 #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"
--- a/webrtc/api/peerconnectionfactory_unittest.cc
+++ b/webrtc/api/peerconnectionfactory_unittest.cc
@ -18,7 +18,6 @@
 #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"
--- a/webrtc/api/remotevideocapturer.cc
+++ b/webrtc/api/remotevideocapturer.cc
@ -1,13 +0,0 @@
-/*
- *  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.
--- a/webrtc/api/remotevideocapturer.h
+++ b/webrtc/api/remotevideocapturer.h
@ -1,16 +0,0 @@
-/*
- *  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_
--- a/webrtc/api/rtpsender.cc
+++ b/webrtc/api/rtpsender.cc
@ -11,7 +11,7 @@
 #include "webrtc/api/rtpsender.h"

 #include "webrtc/api/localaudiosource.h"
-#include "webrtc/api/videosourceinterface.h"
+#include "webrtc/api/mediastreaminterface.h"
 #include "webrtc/base/helpers.h"

 namespace webrtc {
--- a/webrtc/api/test/peerconnectiontestwrapper.cc
+++ b/webrtc/api/test/peerconnectiontestwrapper.cc
@ -14,7 +14,6 @@
 #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"

--- a/webrtc/api/videocapturertracksource_unittest.cc
+++ b/webrtc/api/videocapturertracksource_unittest.cc
@ -11,7 +11,6 @@
 #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"
--- a/webrtc/api/videosource.cc
+++ b/webrtc/api/videosource.cc
@ -1,11 +0,0 @@
-/*
- *  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.
--- a/webrtc/api/videosource.h
+++ b/webrtc/api/videosource.h
@ -1,11 +0,0 @@
-/*
- *  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.
--- a/webrtc/api/videosourceinterface.h
+++ b/webrtc/api/videosourceinterface.h
@ -1,18 +0,0 @@
-/*
- *  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_
--- a/webrtc/api/videosourceproxy.h
+++ b/webrtc/api/videosourceproxy.h
@ -12,7 +12,7 @@
 #define WEBRTC_API_VIDEOSOURCEPROXY_H_

 #include "webrtc/api/proxy.h"
-#include "webrtc/api/videosourceinterface.h"
+#include "webrtc/api/mediastreaminterface.h"

 namespace webrtc {

--- a/webrtc/api/videotrack.h
+++ b/webrtc/api/videotrack.h
@ -15,8 +15,6 @@
 #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"
--- a/webrtc/api/videotrackrenderers.cc
+++ b/webrtc/api/videotrackrenderers.cc
@ -1,13 +0,0 @@
-/*
- *  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.
--- a/webrtc/api/videotrackrenderers.h
+++ b/webrtc/api/videotrackrenderers.h
@ -1,16 +0,0 @@
-/*
- *  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_
--- a/webrtc/api/videotracksource.h
+++ b/webrtc/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"

--- a/webrtc/examples/peerconnection/client/conductor.cc
+++ b/webrtc/examples/peerconnection/client/conductor.cc
@ -13,7 +13,6 @@
 #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"
--- a/webrtc/media/base/capturemanager.cc
+++ b/webrtc/media/base/capturemanager.cc
@ -1,13 +0,0 @@
-/*
- *  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.
--- a/webrtc/media/base/capturemanager.h
+++ b/webrtc/media/base/capturemanager.h
@ -1,11 +0,0 @@
-/*
- *  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.
--- a/webrtc/media/base/capturerenderadapter.cc
+++ b/webrtc/media/base/capturerenderadapter.cc
@ -1,11 +0,0 @@
-/*
- *  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.
--- a/webrtc/media/base/capturerenderadapter.h
+++ b/webrtc/media/base/capturerenderadapter.h
@ -1,11 +0,0 @@
-/*
- *  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.
--- a/webrtc/media/media.gyp
+++ b/webrtc/media/media.gyp
@ -33,8 +33,6 @@
      'sources': [
        'base/audioframe.h',
        'base/audiosource.h',
-        'base/capturemanager.cc',
-        'base/capturemanager.h',
        'base/codec.cc',
        'base/codec.h',
        'base/cpuid.cc',