Revert of Refactor video capturing code in the render process

content/renderer/media/media_stream_video_source_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 88 matching lines @@
         CreateTrackAndStartSource(constraints, capture_width, capture_height ,
                                   30);
 
     MockMediaStreamVideoSink sink;
     MediaStreamVideoSink::AddToVideoTrack(&sink, track);
     EXPECT_EQ(0, sink.number_of_frames());
 
     scoped_refptr<media::VideoFrame> frame =
         media::VideoFrame::CreateBlackFrame(gfx::Size(capture_width,
                                                       capture_height));
-    mock_source()->DeliverVideoFrame(frame, media::VideoCaptureFormat());
+    mock_source()->DeliverVideoFrame(frame);
     EXPECT_EQ(1, sink.number_of_frames());
 
     // Expect the delivered frame to be cropped.
     EXPECT_EQ(expected_height, sink.frame_size().height());
     EXPECT_EQ(expected_width, sink.frame_size().width());
     MediaStreamVideoSink::RemoveFromVideoTrack(&sink, track);
   }
 
   void ReleaseTrackAndSourceOnAddTrackCallback(
       const blink::WebMediaStreamTrack& track_to_release) {
@@ skipping 291 matching lines @@
       CreateTrackAndStartSource(factory.CreateWebMediaConstraints(),
                                 640, 480, 30);
 
   MockMediaStreamVideoSink sink;
   MediaStreamVideoSink::AddToVideoTrack(&sink, track);
   EXPECT_EQ(0, sink.number_of_frames());
 
   {
     scoped_refptr<media::VideoFrame> frame1 =
         media::VideoFrame::CreateBlackFrame(gfx::Size(320, 240));
-    mock_source()->DeliverVideoFrame(frame1,
-                                     media::VideoCaptureFormat());
+    mock_source()->DeliverVideoFrame(frame1);
   }
   EXPECT_EQ(1, sink.number_of_frames());
   // Expect the delivered frame to be passed unchanged since its smaller than
   // max requested.
   EXPECT_EQ(320, sink.frame_size().width());
   EXPECT_EQ(240, sink.frame_size().height());
 
   {
     scoped_refptr<media::VideoFrame> frame2 =
           media::VideoFrame::CreateBlackFrame(gfx::Size(640, 480));
-    mock_source()->DeliverVideoFrame(frame2,
-                                     media::VideoCaptureFormat());
+    mock_source()->DeliverVideoFrame(frame2);
   }
   EXPECT_EQ(2, sink.number_of_frames());
   // Expect the delivered frame to be passed unchanged since its smaller than
   // max requested.
   EXPECT_EQ(640, sink.frame_size().width());
   EXPECT_EQ(480, sink.frame_size().height());
 
   {
     scoped_refptr<media::VideoFrame> frame3 =
           media::VideoFrame::CreateBlackFrame(gfx::Size(1280, 720));
-    mock_source()->DeliverVideoFrame(frame3,
-                                     media::VideoCaptureFormat());
+    mock_source()->DeliverVideoFrame(frame3);
   }
   EXPECT_EQ(3, sink.number_of_frames());
   // Expect a frame to be cropped since its larger than max requested.
   EXPECT_EQ(800, sink.frame_size().width());
   EXPECT_EQ(700, sink.frame_size().height());
 
   MediaStreamVideoSink::RemoveFromVideoTrack(&sink, track);
 }
 
 TEST_F(MediaStreamVideoSourceTest, IsConstraintSupported) {
@@ skipping 12 matching lines @@
   EXPECT_TRUE(MediaStreamVideoSource::IsConstraintSupported(
         MediaStreamVideoSource::kMaxAspectRatio));
   EXPECT_TRUE(MediaStreamVideoSource::IsConstraintSupported(
       MediaStreamVideoSource::kMinAspectRatio));
 
   EXPECT_FALSE(MediaStreamVideoSource::IsConstraintSupported(
       "something unsupported"));
 }
 
 }  // namespace content