Revert of Refactor video capturing code in the render process

content/renderer/media/media_stream_video_capture_source_unittest.cc

Index: content/renderer/media/media_stream_video_capture_source_unittest.cc
diff --git a/content/renderer/media/media_stream_video_capture_source_unittest.cc b/content/renderer/media/media_stream_video_capture_source_unittest.cc
index f7210703bb09c8084e8351b4caaaf02ce3019270..ea203a2844d3592ff91bf694376abe47ed617645 100644
--- a/content/renderer/media/media_stream_video_capture_source_unittest.cc
+++ b/content/renderer/media/media_stream_video_capture_source_unittest.cc
@@ -17,11 +17,11 @@
   explicit MockVideoCapturerDelegate(const StreamDeviceInfo& device_info)
       : VideoCapturerDelegate(device_info) {}
 
-  MOCK_METHOD3(StartCapture,
+  MOCK_METHOD3(StartDeliver,
                void(const media::VideoCaptureParams& params,
-                    const VideoCaptureDeliverFrameCB& new_frame_callback,
+                    const NewFrameCallback& new_frame_callback,
                     const StartedCallback& started_callback));
-  MOCK_METHOD0(StopCapture,void());
+  MOCK_METHOD0(StopDeliver,void());
 
  private:
   virtual ~MockVideoCapturerDelegate() {}
@@ -68,13 +68,13 @@
   device_info.device.type = MEDIA_TAB_VIDEO_CAPTURE;
   InitWithDeviceInfo(device_info);
 
-  EXPECT_CALL(*delegate_, StartCapture(
+  EXPECT_CALL(*delegate_, StartDeliver(
       testing::Field(&media::VideoCaptureParams::allow_resolution_change, true),
       testing::_,
       testing::_)).Times(1);
   blink::WebMediaStreamTrack track = StartSource();
   // When the track goes out of scope, the source will be stopped.
-  EXPECT_CALL(*delegate_, StopCapture());
+  EXPECT_CALL(*delegate_, StopDeliver());
 }
 
 TEST_F(MediaStreamVideoCapturerSourceTest,
@@ -83,13 +83,13 @@
   device_info.device.type = MEDIA_DESKTOP_VIDEO_CAPTURE;
   InitWithDeviceInfo(device_info);
 
-  EXPECT_CALL(*delegate_, StartCapture(
+  EXPECT_CALL(*delegate_, StartDeliver(
       testing::Field(&media::VideoCaptureParams::allow_resolution_change, true),
       testing::_,
       testing::_)).Times(1);
   blink::WebMediaStreamTrack track = StartSource();
   // When the track goes out of scope, the source will be stopped.
-  EXPECT_CALL(*delegate_, StopCapture());
+  EXPECT_CALL(*delegate_, StopDeliver());
 }
 
 }  // namespace content