Remove dead code related to media device enumerations and monitoring.

content/browser/renderer_host/media/video_capture_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 <stdint.h>
 
 #include <map>
 #include <memory>
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/browser/renderer_host/media/media_stream_requester.h"
 #include "content/browser/renderer_host/media/video_capture_host.h"
 #include "content/browser/renderer_host/media/video_capture_manager.h"
+#include "content/common/media/media_devices.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/mock_resource_context.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/test/test_content_browser_client.h"
 #include "media/audio/mock_audio_manager.h"
 #include "media/base/media_switches.h"
 #include "media/capture/video_capture_types.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "net/url_request/url_request_context.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::AnyNumber;
 using ::testing::DoAll;
 using ::testing::InSequence;
 using ::testing::Mock;
 using ::testing::Return;
 using ::testing::SaveArg;
 using ::testing::StrictMock;
 
 namespace content {
 
+namespace {
+
+void VideoInputDevicesEnumerated(base::Closure quit_closure,
+                                 const std::string& salt,
+                                 const url::Origin& security_origin,
+                                 MediaDeviceInfoArray* out,
+                                 const MediaDeviceEnumeration& enumeration) {
+  for (const auto& info : enumeration[MEDIA_DEVICE_TYPE_VIDEO_INPUT]) {
+    std::string device_id = MediaStreamManager::GetHMACForMediaDeviceID(
+        salt, security_origin, info.device_id);
+    out->push_back(MediaDeviceInfo(device_id, info.label, std::string()));
+  }
+  quit_closure.Run();
+}
+
+}  // namespace
+
 // Id used to identify the capture session between renderer and
 // video_capture_host. This is an arbitrary value.
 static const int kDeviceId = 555;
 
 class MockMediaStreamRequester : public MediaStreamRequester {
  public:
   MockMediaStreamRequester() {}
   virtual ~MockMediaStreamRequester() {}
 
   // MediaStreamRequester implementation.
@@ skipping 70 matching lines @@
 
   void OpenSession() {
     const int render_process_id = 1;
     const int render_frame_id = 1;
     const int page_request_id = 1;
     const url::Origin security_origin(GURL("http://test.com"));
 
     ASSERT_TRUE(opened_device_label_.empty());
 
     // Enumerate video devices.
-    StreamDeviceInfoArray devices;
+    MediaDeviceInfoArray video_devices;
     {
       base::RunLoop run_loop;
-      std::string label = media_stream_manager_->EnumerateDevices(
-          &stream_requester_,
-          render_process_id,
-          render_frame_id,
-          browser_context_.GetResourceContext()->GetMediaDeviceIDSalt(),
-          page_request_id,
-          MEDIA_DEVICE_VIDEO_CAPTURE,
-          security_origin);
-      EXPECT_CALL(stream_requester_,
-                  DevicesEnumerated(render_frame_id, page_request_id, label, _))
-          .Times(1)
-          .WillOnce(DoAll(ExitMessageLoop(task_runner_, run_loop.QuitClosure()),
-                          SaveArg<3>(&devices)));
+      MediaDevicesManager::BoolDeviceTypes devices_to_enumerate;
+      devices_to_enumerate[MEDIA_DEVICE_TYPE_VIDEO_INPUT] = true;
+      media_stream_manager_->media_devices_manager()->EnumerateDevices(
+          devices_to_enumerate,
+          base::Bind(
+              &VideoInputDevicesEnumerated, run_loop.QuitClosure(),
+              browser_context_.GetResourceContext()->GetMediaDeviceIDSalt(),
+              security_origin, &video_devices));
       run_loop.Run();
-      Mock::VerifyAndClearExpectations(&stream_requester_);
-      media_stream_manager_->CancelRequest(label);
     }
-    ASSERT_FALSE(devices.empty());
-    ASSERT_EQ(StreamDeviceInfo::kNoId, devices[0].session_id);
+    ASSERT_FALSE(video_devices.empty());
 
     // Open the first device.
     {
       base::RunLoop run_loop;
       StreamDeviceInfo opened_device;
       media_stream_manager_->OpenDevice(
-          &stream_requester_,
-          render_process_id,
-          render_frame_id,
+          &stream_requester_, render_process_id, render_frame_id,
           browser_context_.GetResourceContext()->GetMediaDeviceIDSalt(),
-          page_request_id,
-          devices[0].device.id,
-          MEDIA_DEVICE_VIDEO_CAPTURE,
-          security_origin);
+          page_request_id, video_devices[0].device_id,
+          MEDIA_DEVICE_VIDEO_CAPTURE, security_origin);
       EXPECT_CALL(stream_requester_,
                   DeviceOpened(render_frame_id, page_request_id, _, _))
           .Times(1)
           .WillOnce(DoAll(ExitMessageLoop(task_runner_, run_loop.QuitClosure()),
                           SaveArg<2>(&opened_device_label_),
                           SaveArg<3>(&opened_device)));
       run_loop.Run();
       Mock::VerifyAndClearExpectations(&stream_requester_);
       ASSERT_NE(StreamDeviceInfo::kNoId, opened_device.session_id);
       opened_session_id_ = opened_device.session_id;
@@ skipping 167 matching lines @@
   StartCapture();
 
   // When the session is closed via the stream without stopping capture, the
   // ENDED event is sent.
   EXPECT_CALL(*this, OnStateChanged(mojom::VideoCaptureState::ENDED));
   CloseSession();
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace content