VideoCapture: remove last remnants of IPC

content/renderer/media/video_capture_impl_unittest.cc

 // Copyright (c) 2012 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 <stddef.h>
 
 #include "base/macros.h"
 #include "base/memory/shared_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "content/child/child_process.h"
 #include "content/common/video_capture.mojom.h"
 #include "content/renderer/media/video_capture_impl.h"
 #include "mojo/public/cpp/system/platform_handle.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::Invoke;
 using ::testing::InvokeWithoutArgs;
 using ::testing::SaveArg;
 using ::testing::WithArgs;
 
 namespace content {
 
-const int kSessionId = 1;
+const int kSessionId = 11;
 
 void RunEmptyFormatsCallback(const VideoCaptureDeviceFormatsCB& callback) {
   media::VideoCaptureFormats formats;
   callback.Run(formats);
 }
 
 // Mock implementation of the Mojo Host service.
 class MockMojoVideoCaptureHost : public mojom::VideoCaptureHost {
  public:
   MockMojoVideoCaptureHost() : released_buffer_count_(0) {
@@ skipping 33 matching lines @@
   void increase_released_buffer_count() { released_buffer_count_++; }
 
  private:
   int released_buffer_count_;
 
   DISALLOW_COPY_AND_ASSIGN(MockMojoVideoCaptureHost);
 };
 
 // This class encapsulates a VideoCaptureImpl under test and the necessary
 // accessory classes, namely:
-// - a VideoCaptureMessageFilter;
 // - a MockMojoVideoCaptureHost, mimicking the RendererHost;
 // - a few callbacks that are bound when calling operations of VideoCaptureImpl
 //  and on which we set expectations.
 class VideoCaptureImplTest : public ::testing::Test {
  public:
   VideoCaptureImplTest()
-      : message_filter_(new VideoCaptureMessageFilter),
-        video_capture_impl_(
-            new VideoCaptureImpl(kSessionId,
-                                 message_filter_.get(),
-                                 base::ThreadTaskRunnerHandle::Get())) {
+      : video_capture_impl_(new VideoCaptureImpl(kSessionId)) {
     params_small_.requested_format = media::VideoCaptureFormat(
         gfx::Size(176, 144), 30, media::PIXEL_FORMAT_I420);
     params_large_.requested_format = media::VideoCaptureFormat(
         gfx::Size(320, 240), 30, media::PIXEL_FORMAT_I420);
 
     video_capture_impl_->SetVideoCaptureHostForTesting(
         &mock_video_capture_host_);
-    video_capture_impl_->device_id_ = 2;
   }
 
  protected:
   // These four mocks are used to create callbacks for the different oeprations.
   MOCK_METHOD2(OnFrameReady,
                void(const scoped_refptr<media::VideoFrame>&, base::TimeTicks));
   MOCK_METHOD1(OnStateUpdate, void(VideoCaptureState));
   MOCK_METHOD1(OnDeviceFormatsInUse, void(const media::VideoCaptureFormats&));
   MOCK_METHOD1(OnDeviceSupportedFormats,
                void(const media::VideoCaptureFormats&));
@@ skipping 55 matching lines @@
             base::Unretained(this));
     video_capture_impl_->GetDeviceFormatsInUse(callback);
   }
 
   void OnStateChanged(mojom::VideoCaptureState state) {
     video_capture_impl_->OnStateChanged(state);
   }
 
   const base::MessageLoop message_loop_;
   const ChildProcess child_process_;
-  const scoped_refptr<VideoCaptureMessageFilter> message_filter_;
   const std::unique_ptr<VideoCaptureImpl> video_capture_impl_;
   MockMojoVideoCaptureHost mock_video_capture_host_;
   media::VideoCaptureParams params_small_;
   media::VideoCaptureParams params_large_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureImplTest);
 };
 
 TEST_F(VideoCaptureImplTest, Simple) {
@@ skipping 157 matching lines @@
   EXPECT_CALL(mock_video_capture_host_, DoStart(_, kSessionId, params_small_));
 
   StartCapture(0, params_small_);
 
   OnStateChanged(mojom::VideoCaptureState::FAILED);
 
   StopCapture(0);
 }
 
 }  // namespace content