Remove old videosourceinterface files.

I have one downstream CL that needs to land first before landing this.

Bug: webrtc:6828
Change-Id: Ib6f3ae78f83775278e4c2e4d34a93fe3748fb851
Reviewed-on: https://webrtc-review.googlesource.com/38340
Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21567}

media/BUILD.gn

@@ -95,7 +95,6 @@ rtc_static_library("rtc_media_base") {
     "base/videosinkinterface.h",
     "base/videosourcebase.cc",
     "base/videosourcebase.h",
-    "base/videosourceinterface.h",
   ]
 
   if (!build_with_chromium && is_clang) {

media/base/mediachannel.h

@@ -24,11 +24,11 @@
 #include "api/video/video_content_type.h"
 #include "api/video/video_timing.h"
 #include "api/videosinkinterface.h"
+#include "api/videosourceinterface.h"
 #include "call/video_config.h"
 #include "media/base/codec.h"
 #include "media/base/mediaconstants.h"
 #include "media/base/streamparams.h"
-#include "media/base/videosourceinterface.h"
 #include "modules/audio_processing/include/audio_processing_statistics.h"
 #include "rtc_base/asyncpacketsocket.h"
 #include "rtc_base/basictypes.h"

media/base/videocapturer.h

@@ -20,10 +20,10 @@
 #include <string>
 #include <vector>
 
+#include "api/videosourceinterface.h"
 #include "media/base/videoadapter.h"
 #include "media/base/videobroadcaster.h"
 #include "media/base/videocommon.h"
-#include "media/base/videosourceinterface.h"
 #include "rtc_base/constructormagic.h"
 #include "rtc_base/criticalsection.h"
 #include "rtc_base/sigslot.h"

media/base/videosourcebase.h

@@ -14,7 +14,7 @@
 #include <vector>
 
 #include "api/video/video_frame.h"
-#include "media/base/videosourceinterface.h"
+#include "api/videosourceinterface.h"
 #include "rtc_base/thread_checker.h"
 
 namespace rtc {

media/base/videosourceinterface.cc

@@ -1,17 +0,0 @@
-/*
- *  Copyright (c) 2017 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 "media/base/videosourceinterface.h"
-namespace rtc {
-
-VideoSinkWants::VideoSinkWants() = default;
-VideoSinkWants::~VideoSinkWants() = default;
-
-}  // namespace rtc

media/base/videosourceinterface.h

@@ -1,17 +0,0 @@
-/*
- *  Copyright (c) 2016 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 MEDIA_BASE_VIDEOSOURCEINTERFACE_H_
-#define MEDIA_BASE_VIDEOSOURCEINTERFACE_H_
-
-// TODO(bugs.webrtc.org/6828): remove this file after downstream is updated.
-#include "api/videosourceinterface.h"
-
-#endif  // MEDIA_BASE_VIDEOSOURCEINTERFACE_H_