[Mojo Video Capture] Hook up video capture service behind a feature flag

content/browser/renderer_host/media/video_capture_browsertest.cc

 // Copyright 2017 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 "base/command_line.h"
 #include "base/run_loop.h"
 #include "build/build_config.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/browser/renderer_host/media/video_capture_controller.h"
 #include "content/browser/renderer_host/media/video_capture_manager.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/content_browser_test.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/media_switches.h"
 #include "media/capture/video_capture_types.h"
+#include "services/video_capture/public/cpp/constants.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using testing::_;
 using testing::AtLeast;
 using testing::Invoke;
 using testing::InvokeWithoutArgs;
 using testing::Values;
 
 namespace content {
 
@@ skipping 32 matching lines @@
   MOCK_METHOD2(Aborted, void(MediaStreamType, int));
 };
 
 struct TestParams {
   std::string fake_device_factory_config_string;
   size_t device_index_to_use;
   media::VideoPixelFormat pixel_format_to_use;
   gfx::Size resolution_to_use;
   float frame_rate_to_use;
   bool exercise_accelerated_jpeg_decoding;
+  bool use_mojo_service;
 };
 
 struct FrameInfo {
   gfx::Size size;
   media::VideoPixelFormat pixel_format;
   media::VideoPixelStorage storage_type;
   base::TimeDelta timestamp;
 };
 
+// Integration test that exercises the VideoCaptureManager instance running in
+// the Browser process.
 class VideoCaptureBrowserTest
     : public ContentBrowserTest,
       public ::testing::WithParamInterface<TestParams> {
  public:
   void SetUpAndStartCaptureDeviceOnIOThread(base::Closure continuation) {
     video_capture_manager_ = media_stream_manager_->video_capture_manager();
     ASSERT_TRUE(video_capture_manager_);
     video_capture_manager_->RegisterListener(&mock_stream_provider_listener_);
     video_capture_manager_->EnumerateDevices(
         base::Bind(&VideoCaptureBrowserTest::OnDeviceDescriptorsReceived,
                    base::Unretained(this), std::move(continuation)));
   }
 
   void TearDownCaptureDeviceOnIOThread(base::Closure continuation,
                                        bool post_to_end_of_message_queue) {
-    // StopCaptureForClient must not be called synchronously from either the
+    // DisconnectClient() must not be called synchronously from either the
     // |done_cb| passed to StartCaptureForClient() nor any callback made to a
     // VideoCaptureControllerEventHandler. To satisfy this, we have to post our
     // invocation to the end of the IO message queue.
     if (post_to_end_of_message_queue) {
       base::ThreadTaskRunnerHandle::Get()->PostTask(
           FROM_HERE,
           base::Bind(&VideoCaptureBrowserTest::TearDownCaptureDeviceOnIOThread,
                      base::Unretained(this), continuation, false));
       return;
     }
@@ skipping 14 matching lines @@
         switches::kUseFakeDeviceForMediaStream,
         GetParam().fake_device_factory_config_string);
     command_line->AppendSwitch(switches::kUseFakeUIForMediaStream);
     if (GetParam().exercise_accelerated_jpeg_decoding) {
       base::CommandLine::ForCurrentProcess()->AppendSwitch(
           switches::kUseFakeJpegDecodeAccelerator);
     } else {
       base::CommandLine::ForCurrentProcess()->AppendSwitch(
           switches::kDisableAcceleratedMjpegDecode);
     }
+    if (GetParam().use_mojo_service) {
+      base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+          switches::kEnableFeatures, video_capture::kMojoVideoCapture.name);
+    }
   }
 
   // This cannot be part of an override of SetUp(), because at the time when
   // SetUp() is invoked, the BrowserMainLoop does not exist yet.
   void SetUpRequiringBrowserMainLoopOnMainThread() {
     BrowserMainLoop* browser_main_loop = BrowserMainLoop::GetInstance();
     ASSERT_TRUE(browser_main_loop);
     media_stream_manager_ = browser_main_loop->media_stream_manager();
     ASSERT_TRUE(media_stream_manager_);
   }
@@ skipping 32 matching lines @@
   MediaStreamManager* media_stream_manager_ = nullptr;
   VideoCaptureManager* video_capture_manager_ = nullptr;
   int session_id_ = 0;
   const VideoCaptureControllerID stub_client_id_ = 123;
   MockMediaStreamProviderListener mock_stream_provider_listener_;
   MockVideoCaptureControllerEventHandler mock_controller_event_handler_;
   base::WeakPtr<VideoCaptureController> controller_;
 };
 
 IN_PROC_BROWSER_TEST_P(VideoCaptureBrowserTest, StartAndImmediatelyStop) {
+#if defined(OS_ANDROID)
+  // Mojo video capture is currently not supported on Android

[mcasas, 2017/05/10 02:33:32]

This sounds pretty bad: at least a TODO() and a bug should
be available.  Same in l.216.

[chfremer, 2017/05/10 17:59:39]

Done.

+  if (GetParam().use_mojo_service)
+    return;
+#endif
+
   SetUpRequiringBrowserMainLoopOnMainThread();
   base::RunLoop run_loop;
   auto quit_run_loop_on_current_thread_cb =
       media::BindToCurrentLoop(run_loop.QuitClosure());
   auto after_start_continuation =
       base::Bind(&VideoCaptureBrowserTest::TearDownCaptureDeviceOnIOThread,
                  base::Unretained(this),
                  std::move(quit_run_loop_on_current_thread_cb), true);
   BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&VideoCaptureBrowserTest::SetUpAndStartCaptureDeviceOnIOThread,
                  base::Unretained(this), std::move(after_start_continuation)));
   run_loop.Run();
 }
 
 IN_PROC_BROWSER_TEST_P(VideoCaptureBrowserTest,
                        ReceiveFramesFromFakeCaptureDevice) {
-// TODO(chfremer): This test case is flaky on Android. Find out cause of
-// flakiness and then re-enable. See crbug.com/709039.
 #if defined(OS_ANDROID)
+  // TODO(chfremer): This test case is flaky on Android. Find out cause of
+  // flakiness and then re-enable. See crbug.com/709039.
   if (GetParam().exercise_accelerated_jpeg_decoding)
     return;
+  // Mojo video capture is currently not supported on Android
+  if (GetParam().use_mojo_service)
+    return;
 #endif
 
   SetUpRequiringBrowserMainLoopOnMainThread();
 
   std::vector<FrameInfo> received_frame_infos;
   static const size_t kMinFramesToReceive = 5;
   static const size_t kMaxFramesToReceive = 300;
   base::RunLoop run_loop;
 
   auto quit_run_loop_on_current_thread_cb =
@@ skipping 62 matching lines @@
       EXPECT_GT(frame_info.timestamp, previous_timestamp);
     first_frame = false;
     previous_timestamp = frame_info.timestamp;
   }
 }
 
 INSTANTIATE_TEST_CASE_P(
     ,
     VideoCaptureBrowserTest,
     Values(TestParams{"fps=25,device-count=2", 0, media::PIXEL_FORMAT_I420,
-                      gfx::Size(1280, 720), 25.0f, false},
+                      gfx::Size(1280, 720), 25.0f, false, false},
+           TestParams{"fps=25,device-count=2", 0, media::PIXEL_FORMAT_I420,
+                      gfx::Size(1280, 720), 25.0f, false, true},
            // The 2nd device outputs Y16
            TestParams{"fps=25,device-count=2", 1, media::PIXEL_FORMAT_Y16,
-                      gfx::Size(1280, 720), 25.0f, false},
+                      gfx::Size(1280, 720), 25.0f, false, false},
+           TestParams{"fps=25,device-count=2", 1, media::PIXEL_FORMAT_Y16,
+                      gfx::Size(1280, 720), 25.0f, false, true},
            TestParams{"fps=15,device-count=2", 1, media::PIXEL_FORMAT_Y16,
-                      gfx::Size(640, 480), 15.0f, false},
+                      gfx::Size(640, 480), 15.0f, false, false},
            // The 3rd device outputs MJPEG, which is converted to I420.
            TestParams{"fps=15,device-count=3", 2, media::PIXEL_FORMAT_I420,
-                      gfx::Size(640, 480), 25.0f, false},
+                      gfx::Size(640, 480), 25.0f, false, false},
+           TestParams{"fps=15,device-count=3", 2, media::PIXEL_FORMAT_I420,
+                      gfx::Size(640, 480), 25.0f, false, true},
            TestParams{"fps=6,device-count=3", 2, media::PIXEL_FORMAT_I420,
-                      gfx::Size(640, 480), 6.0f, true}));
+                      gfx::Size(640, 480), 6.0f, true, false}));

[mcasas, 2017/05/10 02:33:33]

Consider using ::testing::Combine to simplify all this cases

https://github.com/google/googletest/blob/master/googletest/docs/AdvancedGuid...
(search for "Combine" in the link, plenty of examples in
Cr codebase too).

[chfremer, 2017/05/10 17:59:39]

I prefer to not use ::testing::Combine() here, because we do not need to test
all combinations. 
I agree that this hand-select list is quite verbose, but I think it is worth the
build/bot time savings of not running test cases that are not needed, especially
since these tests are fairly slow (can be > 1s per test case).

[mcasas, 2017/05/10 18:15:43]

Why not?  It should be made explicit here why not,
otherwise Combine() seems to be easier to read, and
the time spent in bots should not be a concern: we want
more testing, not less; and also, needed infra would be 
provisioned only when there's load for it.

[chfremer, 2017/05/10 21:08:05]

Done.

 
 }  // namespace content