chrome/browser/policy/policy_browsertest.cc - Issue 183743021: Implement MediaCaptureDevices.

Unified Diff: chrome/browser/policy/policy_browsertest.cc

Issue 183743021: Implement MediaCaptureDevices. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/media/media_capture_devices_dispatcher.cc ('K') | « chrome/browser/media/media_capture_devices_dispatcher.cc ('k') | content/browser/media/media_devices_monitor.cc » ('j') | content/public/browser/media_capture_devices.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..c6216a6c6900a460b4d03cb421940f0446f61ab6 100644

--- a/chrome/browser/policy/policy_browsertest.cc

+++ b/chrome/browser/policy/policy_browsertest.cc

@@ -96,6 +96,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,7 +2777,7 @@ IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest,

content::BrowserThread::PostTaskAndReply(

content::BrowserThread::IO, FROM_HERE,

- base::Bind(&MediaCaptureDevicesDispatcher::OnAudioCaptureDevicesChanged,

+ base::Bind(&MediaCaptureDevicesDispatcher::SetTestAudioCaptureDevices,

base::Unretained(MediaCaptureDevicesDispatcher::GetInstance()),

audio_devices),

base::Bind(&MediaStreamDevicesControllerBrowserTest::FinishAudioTest,

@@ -2809,7 +2810,7 @@ IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest,

content::BrowserThread::PostTaskAndReply(

content::BrowserThread::IO, FROM_HERE,

base::Bind(

- &MediaCaptureDevicesDispatcher::OnAudioCaptureDevicesChanged,

+ &MediaCaptureDevicesDispatcher::SetTestAudioCaptureDevices,

base::Unretained(MediaCaptureDevicesDispatcher::GetInstance()),

audio_devices),

base::Bind(

@@ -2833,7 +2834,7 @@ IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest,

content::BrowserThread::PostTaskAndReply(

content::BrowserThread::IO, FROM_HERE,

- base::Bind(&MediaCaptureDevicesDispatcher::OnVideoCaptureDevicesChanged,

+ base::Bind(&MediaCaptureDevicesDispatcher::SetTestVideoCaptureDevices,

base::Unretained(MediaCaptureDevicesDispatcher::GetInstance()),

video_devices),

base::Bind(&MediaStreamDevicesControllerBrowserTest::FinishVideoTest,

@@ -2865,8 +2866,7 @@ IN_PROC_BROWSER_TEST_P(MediaStreamDevicesControllerBrowserTest,

content::BrowserThread::PostTaskAndReply(

content::BrowserThread::IO, FROM_HERE,

- base::Bind(

- &MediaCaptureDevicesDispatcher::OnVideoCaptureDevicesChanged,

+ base::Bind(&MediaCaptureDevicesDispatcher::SetTestVideoCaptureDevices,

base::Unretained(MediaCaptureDevicesDispatcher::GetInstance()),

video_devices),

base::Bind(