Implement MediaCaptureDevices.

chrome/browser/policy/policy_browsertest.cc

Index: chrome/browser/policy/policy_browsertest.cc
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index ff2e9425fe83cbc8e9c674d00f8187a8aad4ab72..8c3c53d04ab8ec71e7be471935727c80b498632c 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -42,7 +42,6 @@
 #include "chrome/browser/extensions/updater/extension_updater.h"
 #include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
-#include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/media/media_stream_devices_controller.h"
 #include "chrome/browser/metrics/variations/variations_service.h"
 #include "chrome/browser/net/url_request_mock_util.h"
@@ -96,6 +95,7 @@
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/gpu_data_manager.h"
+#include "content/public/browser/media_capture_devices.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
@@ -2776,8 +2776,8 @@ IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest,
 
   content::BrowserThread::PostTaskAndReply(
       content::BrowserThread::IO, FROM_HERE,
-      base::Bind(&MediaCaptureDevicesDispatcher::OnAudioCaptureDevicesChanged,
-                 base::Unretained(MediaCaptureDevicesDispatcher::GetInstance()),
+      base::Bind(&content::MediaCaptureDevices::SetAudioCaptureDevices,
+                 base::Unretained(content::MediaCaptureDevices::GetInstance()),
                  audio_devices),
       base::Bind(&MediaStreamDevicesControllerBrowserTest::FinishAudioTest,
                  this));
@@ -2809,8 +2809,8 @@ IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest,
     content::BrowserThread::PostTaskAndReply(
         content::BrowserThread::IO, FROM_HERE,
         base::Bind(
-            &MediaCaptureDevicesDispatcher::OnAudioCaptureDevicesChanged,
-            base::Unretained(MediaCaptureDevicesDispatcher::GetInstance()),
+            &content::MediaCaptureDevices::SetAudioCaptureDevices,
+            base::Unretained(content::MediaCaptureDevices::GetInstance()),
             audio_devices),
         base::Bind(
             &MediaStreamDevicesControllerBrowserTest::FinishAudioTest,
@@ -2833,8 +2833,8 @@ IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest,
 
   content::BrowserThread::PostTaskAndReply(
       content::BrowserThread::IO, FROM_HERE,
-      base::Bind(&MediaCaptureDevicesDispatcher::OnVideoCaptureDevicesChanged,
-                 base::Unretained(MediaCaptureDevicesDispatcher::GetInstance()),
+      base::Bind(&content::MediaCaptureDevices::SetVideoCaptureDevices,
+                 base::Unretained(content::MediaCaptureDevices::GetInstance()),
                  video_devices),
       base::Bind(&MediaStreamDevicesControllerBrowserTest::FinishVideoTest,
                  this));
@@ -2866,8 +2866,8 @@ IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest,
     content::BrowserThread::PostTaskAndReply(
         content::BrowserThread::IO, FROM_HERE,
         base::Bind(
-            &MediaCaptureDevicesDispatcher::OnVideoCaptureDevicesChanged,
-            base::Unretained(MediaCaptureDevicesDispatcher::GetInstance()),
+            &content::MediaCaptureDevices::SetVideoCaptureDevices,
+            base::Unretained(content::MediaCaptureDevices::GetInstance()),
             video_devices),
         base::Bind(
             &MediaStreamDevicesControllerBrowserTest::FinishVideoTest,