Revert EVS revisions 209760, 298753, 213143.

content/renderer/media/video_capture_impl_unittest.cc

Index: content/renderer/media/video_capture_impl_unittest.cc
diff --git a/content/renderer/media/video_capture_impl_unittest.cc b/content/renderer/media/video_capture_impl_unittest.cc
index 440d3303e5d218cc506eee14d45f7c1c24f8c6f5..7d347e5da89017c0c8f69bcdae4a2b7c283eb61c 100644
--- a/content/renderer/media/video_capture_impl_unittest.cc
+++ b/content/renderer/media/video_capture_impl_unittest.cc
@@ -4,7 +4,6 @@
 
 #include "base/message_loop/message_loop.h"
 #include "content/child/child_process.h"
-#include "content/common/media/encoded_video_capture_messages.h"
 #include "content/common/media/video_capture_messages.h"
 #include "content/renderer/media/video_capture_impl.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -75,18 +74,6 @@ class VideoCaptureImplTest : public ::testing::Test {
         IPC_MESSAGE_HANDLER(VideoCaptureHostMsg_Stop, DeviceStopCapture)
         IPC_MESSAGE_HANDLER(VideoCaptureHostMsg_BufferReady,
                             DeviceReceiveEmptyBuffer)
-        IPC_MESSAGE_HANDLER(EncodedVideoCaptureHostMsg_GetCapabilities,
-                            DeviceGetEncodingCapabilities)
-        IPC_MESSAGE_HANDLER(EncodedVideoCaptureHostMsg_OpenBitstream,
-                            DeviceOpenEncodedBitstream)
-        IPC_MESSAGE_HANDLER(EncodedVideoCaptureHostMsg_CloseBitstream,
-                            DeviceCloseEncodedBitstream)
-        IPC_MESSAGE_HANDLER(EncodedVideoCaptureHostMsg_TryConfigureBitstream,
-                            DeviceSetEncodingConfig)
-        IPC_MESSAGE_HANDLER(EncodedVideoCaptureHostMsg_RequestKeyFrame,
-                            DeviceRequestKeyFrame)
-        IPC_MESSAGE_HANDLER(EncodedVideoCaptureHostMsg_BitstreamBufferConsumed,
-                            DeviceReturnEncodedBuffer)
         IPC_MESSAGE_UNHANDLED(handled = false)
       IPC_END_MESSAGE_MAP()
       EXPECT_TRUE(handled);
@@ -107,22 +94,6 @@ class VideoCaptureImplTest : public ::testing::Test {
     }
 
     void DeviceReceiveEmptyBuffer(int device_id, int buffer_id) {}
-
-    void DeviceGetEncodingCapabilities(
-        int device_id, media::VideoCaptureSessionId session_id) {}
-
-    void DeviceOpenEncodedBitstream(int device_id,
-                                    media::VideoCaptureSessionId session_id,
-                                    media::VideoEncodingParameters params) {}
-
-    void DeviceCloseEncodedBitstream(int device_id) {}
-
-    void DeviceSetEncodingConfig(
-        int device_id, media::RuntimeVideoEncodingParameters params) {}
-
-    void DeviceRequestKeyFrame(int device_id) {}
-
-    void DeviceReturnEncodedBuffer(int device_id, int buffer_id) {}
   };
 
   VideoCaptureImplTest()