Revert "[Mojo Video Capture] Add integration test for crashing video …

…capture process"

This reverts commit 4b67e64.

Reason for revert: content_browsertests failing on chromium.linux/Cast Audio Linux, see https://bugs.chromium.org/p/chromium/issues/detail?id=733000

Original change's description:
> [Mojo Video Capture] Add integration test for crashing video capture process
> 
> This CL is part of the Mojo Video Capture work. For the bigger picture,
> see [1] CL27
> 
> Adds a content_browsertest RecoverFromCrashInVideoCaptureProcess, which does the
> following:
> 1. starts video capture
> 2. verifies that video is rendered
> 3. finds and forcefully shuts down the process hosting the video capture service
> 4. verifies that video capturing and rendering stops
> 5. restarts video capture
> 6. verifies that it video is rendered again
> 
> In order to make this work, I added code for looking up browser child processes
> from a string tag, which in case of services is supposed to be set to the
> service name.
> 
> BUG=584797
> TEST=
>   content_browsertests --gtest_filter="GetUserMediaVideoCaptureBrowserTest.*"
> 
> [1] https://docs.google.com/a/chromium.org/document/d/1Qw7rw1AJy0QHXjha36jZNiEuxsxWslJ_X-zpOhijvI8/edit?usp=sharing
> 
> Change-Id: I440bc513b52686cd2d4803890f17dcb690a8c717
> Reviewed-on: https://chromium-review.googlesource.com/521806
> Reviewed-by: John Abd-El-Malek <jam@chromium.org>
> Reviewed-by: Will Harris <wfh@chromium.org>
> Reviewed-by: Ken Rockot <rockot@chromium.org>
> Reviewed-by: Emircan Uysaler <emircan@chromium.org>
> Commit-Queue: Christian Fremerey <chfremer@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#479136}

TBR=jam@chromium.org,rockot@chromium.org,emircan@chromium.org,wfh@chromium.org,chfremer@chromium.org

Change-Id: I6c8f6b1a2eb1eb8b23317276b39041caa0777351
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 584797
Reviewed-on: https://chromium-review.googlesource.com/534543
Reviewed-by: Christian Fremerey <chfremer@chromium.org>
Commit-Queue: Christian Fremerey <chfremer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#479191}

content/browser/renderer_host/media/service_launched_video_capture_device.cc

@@ -24,8 +24,7 @@ ServiceLaunchedVideoCaptureDevice::~ServiceLaunchedVideoCaptureDevice() {
 void ServiceLaunchedVideoCaptureDevice::GetPhotoState(
     media::VideoCaptureDevice::GetPhotoStateCallback callback) const {
   DCHECK(sequence_checker_.CalledOnValidSequence());
-  // Not yet implemented on service side, but is called during
-  // JsLevelVideoCaptureBrowserTest. Do nothing here.
+  NOTIMPLEMENTED();
 }
 
 void ServiceLaunchedVideoCaptureDevice::SetPhotoOptions(

content/public/app/mojo/content_browser_manifest.json

@@ -86,7 +86,7 @@
 
         ],
         "resource_coordinator": [ "coordination_unit" ],
-        "video_capture": [ "capture", "tests" ]
+        "video_capture": [ "capture" ]
       }
     },
     "navigation:frame": {

content/test/BUILD.gn

@@ -692,7 +692,6 @@ test("content_browsertests") {
     "../browser/renderer_host/input/touch_action_browsertest.cc",
     "../browser/renderer_host/input/touch_input_browsertest.cc",
     "../browser/renderer_host/input/touch_selection_controller_client_aura_browsertest.cc",
-    "../browser/renderer_host/media/get_user_media_video_capture_browsertest.cc",
     "../browser/renderer_host/media/video_capture_browsertest.cc",
     "../browser/renderer_host/render_process_host_browsertest.cc",
     "../browser/renderer_host/render_view_host_browsertest.cc",
@@ -803,7 +802,6 @@ test("content_browsertests") {
     "//services/ui/gpu/interfaces",
     "//services/ui/public/cpp/gpu",
     "//services/video_capture/public/cpp",
-    "//services/video_capture/public/interfaces:constants",
     "//storage/browser",
     "//testing/gmock",
     "//testing/gtest",

services/video_capture/BUILD.gn

@@ -37,8 +37,6 @@ source_set("lib") {
     "receiver_mojo_to_media_adapter.h",
     "service_impl.cc",
     "service_impl.h",
-    "testing_controls_impl.cc",
-    "testing_controls_impl.h",
   ]
 
   public_deps = [

services/video_capture/public/interfaces/BUILD.gn

@@ -10,7 +10,6 @@ mojom("interfaces") {
     "device_factory.mojom",
     "device_factory_provider.mojom",
     "receiver.mojom",
-    "testing_controls.mojom",
   ]
 
   deps = [

services/video_capture/service_impl.cc

@@ -8,7 +8,6 @@
 #include "services/service_manager/public/cpp/service_context.h"
 #include "services/video_capture/device_factory_provider_impl.h"
 #include "services/video_capture/public/interfaces/constants.mojom.h"
-#include "services/video_capture/testing_controls_impl.h"
 
 namespace video_capture {
 
@@ -29,10 +28,6 @@ void ServiceImpl::OnStart() {
       // Unretained |this| is safe because |registry_| is owned by |this|.
       base::Bind(&ServiceImpl::OnDeviceFactoryProviderRequest,
                  base::Unretained(this)));
-  registry_.AddInterface<mojom::TestingControls>(
-      // Unretained |this| is safe because |registry_| is owned by |this|.
-      base::Bind(&ServiceImpl::OnTestingControlsRequest,
-                 base::Unretained(this)));
 }
 
 void ServiceImpl::OnBindInterface(
@@ -65,15 +60,6 @@ void ServiceImpl::OnDeviceFactoryProviderRequest(
       std::move(request));
 }
 
-void ServiceImpl::OnTestingControlsRequest(
-    const service_manager::BindSourceInfo& source_info,
-    mojom::TestingControlsRequest request) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  mojo::MakeStrongBinding(
-      base::MakeUnique<TestingControlsImpl>(ref_factory_->CreateRef()),
-      std::move(request));
-}
-
 void ServiceImpl::SetShutdownDelayInSeconds(float seconds) {
   DCHECK(thread_checker_.CalledOnValidThread());
   shutdown_delay_in_seconds_ = seconds;

services/video_capture/service_impl.h

@@ -12,7 +12,6 @@
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/cpp/service_context_ref.h"
 #include "services/video_capture/public/interfaces/device_factory_provider.mojom.h"
-#include "services/video_capture/public/interfaces/testing_controls.mojom.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_com_initializer.h"
@@ -36,9 +35,6 @@ class ServiceImpl : public service_manager::Service {
   void OnDeviceFactoryProviderRequest(
       const service_manager::BindSourceInfo& source_info,
       mojom::DeviceFactoryProviderRequest request);
-  void OnTestingControlsRequest(
-      const service_manager::BindSourceInfo& source_info,
-      mojom::TestingControlsRequest request);
   void SetShutdownDelayInSeconds(float seconds);
   void MaybeRequestQuitDelayed();
   void MaybeRequestQuit();

services/video_capture/service_manifest.json

@@ -3,14 +3,11 @@
   "display_name": "Video Capture",
   "interface_provider_specs": {
     "service_manager:connector": {
-      "provides" : {
-        "capture" : ["video_capture::mojom::DeviceFactoryProvider"],
-        "tests" : [
-          "video_capture::mojom::DeviceFactoryProvider",
-          "video_capture::mojom::TestingControls"
-        ]
+      "provides": {
+        "capture": [ "video_capture::mojom::DeviceFactoryProvider" ],
+        "tests": [ "*" ]
       },
-      "requires" : {
+      "requires": {
         "service_manager": [ "service_manager:all_users" ]
       }
     }