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

content/browser/renderer_host/media/service_video_capture_device_launcher.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 "content/browser/renderer_host/media/service_video_capture_device_launcher.h"
 
 #include "content/browser/renderer_host/media/service_launched_video_capture_device.h"
 #include "content/public/browser/browser_thread.h"
 #include "media/capture/video/video_frame_receiver_on_task_runner.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
@@ skipping 70 matching lines @@
   }
 
   if (!device_factory_->is_bound()) {
     // This can happen when the ServiceVideoCaptureProvider owning
     // |device_factory_| loses connection to the service process and resets
     // |device_factory_|.
     ConcludeLaunchDeviceWithFailure(false, callbacks, std::move(done_cb));
     return;
   }
   video_capture::mojom::DevicePtr device;
-  // We need the temporary variable |device_request| in order to guarantee that
-  // mojo::MakeRequest(&device) happens before base::Passed(&device).
-  auto device_request = mojo::MakeRequest(&device);
   (*device_factory_)
       ->CreateDevice(
-          device_id, std::move(device_request),
+          device_id, mojo::MakeRequest(&device),
           base::Bind(
               // Use of Unretained |this| is safe, because |done_cb| guarantees
               // that |this| stays alive.
               &ServiceVideoCaptureDeviceLauncher::OnCreateDeviceCallback,
               base::Unretained(this), params, base::Passed(&device),
               std::move(receiver), callbacks, base::Passed(&done_cb)));
   state_ = State::DEVICE_START_IN_PROGRESS;
 }
 
 void ServiceVideoCaptureDeviceLauncher::AbortLaunch() {
@@ skipping 20 matching lines @@
       return;
     case video_capture::mojom::DeviceAccessResultCode::ERROR_DEVICE_NOT_FOUND:
     case video_capture::mojom::DeviceAccessResultCode::NOT_INITIALIZED:
       ConcludeLaunchDeviceWithFailure(abort_requested, callbacks,
                                       std::move(done_cb));
       return;
   }
 }
 
 }  // namespace content