Implement MediaCaptureDevices.

chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc

Index: chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
index 50b1239cce5cc5e1a305fa6521e9c0637624309a..90aaf1a1920e9b5d629c97d746c651298bc6fe9d 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
@@ -10,13 +10,13 @@
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/infobars/infobar_delegate.h"
 #include "chrome/browser/infobars/infobar_service.h"
-#include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
+#include "content/public/browser/media_capture_devices.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/web_contents_tester.h"
 #include "grit/generated_resources.h"
@@ -110,8 +110,7 @@ TEST_F(ContentSettingBubbleModelTest, Cookies) {
 }
 
 TEST_F(ContentSettingBubbleModelTest, MediastreamMicAndCamera) {
-  // Required to break dependency on BrowserMainLoop.
-  MediaCaptureDevicesDispatcher::GetInstance()->
+  content::MediaCaptureDevices::GetInstance()->
       DisableDeviceEnumerationForTesting();
 
   TabSpecificContentSettings* content_settings =
@@ -151,8 +150,7 @@ TEST_F(ContentSettingBubbleModelTest, MediastreamMicAndCamera) {
 }
 
 TEST_F(ContentSettingBubbleModelTest, BlockedMediastreamMicAndCamera) {
-  // Required to break dependency on BrowserMainLoop.
-  MediaCaptureDevicesDispatcher::GetInstance()->
+  content::MediaCaptureDevices::GetInstance()->
       DisableDeviceEnumerationForTesting();
 
   WebContentsTester::For(web_contents())->
@@ -240,8 +238,7 @@ TEST_F(ContentSettingBubbleModelTest, BlockedMediastreamMicAndCamera) {
 }
 
 TEST_F(ContentSettingBubbleModelTest, MediastreamMic) {
-  // Required to break dependency on BrowserMainLoop.
-  MediaCaptureDevicesDispatcher::GetInstance()->
+  content::MediaCaptureDevices::GetInstance()->
       DisableDeviceEnumerationForTesting();
 
   TabSpecificContentSettings* content_settings =
@@ -310,8 +307,7 @@ TEST_F(ContentSettingBubbleModelTest, MediastreamMic) {
 }
 
 TEST_F(ContentSettingBubbleModelTest, MediastreamCamera) {
-  // Required to break dependency on BrowserMainLoop.
-  MediaCaptureDevicesDispatcher::GetInstance()->
+  content::MediaCaptureDevices::GetInstance()->
       DisableDeviceEnumerationForTesting();
 
   TabSpecificContentSettings* content_settings =
@@ -380,8 +376,7 @@ TEST_F(ContentSettingBubbleModelTest, MediastreamCamera) {
 }
 
 TEST_F(ContentSettingBubbleModelTest, AccumulateMediastreamMicAndCamera) {
-  // Required to break dependency on BrowserMainLoop.
-  MediaCaptureDevicesDispatcher::GetInstance()->
+  content::MediaCaptureDevices::GetInstance()->
       DisableDeviceEnumerationForTesting();
 
   TabSpecificContentSettings* content_settings =