Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(189)

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

Issue 11896028: Add an location bar icon and a content settings bubble for media settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix browser test Created 7 years, 11 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
Index: chrome/browser/policy/policy_browsertest.cc
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index ed75176850c5e3306f5b1c0eb02f7239f967e0e1..5d8cdbaa6aac09043199efe722347de003a6147c 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -24,6 +24,7 @@
#include "chrome/browser/api/infobars/infobar_service.h"
#include "chrome/browser/autocomplete/autocomplete_controller.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/content_settings/tab_specific_content_settings.h"
#include "chrome/browser/devtools/devtools_window.h"
#include "chrome/browser/download/download_prefs.h"
#include "chrome/browser/extensions/crx_installer.h"
@@ -1780,8 +1781,13 @@ class MediaStreamDevicesControllerBrowserTest
content::MEDIA_OPEN_DEVICE, "fake_dev",
content::MEDIA_DEVICE_AUDIO_CAPTURE,
content::MEDIA_NO_SERVICE);
+ TabSpecificContentSettings* content_settings =
+ TabSpecificContentSettings::FromWebContents(
+ chrome::GetActiveWebContents(browser()));
MediaStreamDevicesController controller(
- browser()->profile(), request,
+ browser()->profile(),
+ content_settings,
+ request,
base::Bind(&MediaStreamDevicesControllerBrowserTest::Accept, this));
controller.DismissInfoBarAndTakeActionOnSettings();
@@ -1793,8 +1799,11 @@ class MediaStreamDevicesControllerBrowserTest
content::MEDIA_OPEN_DEVICE, "fake_dev",
content::MEDIA_NO_SERVICE,
content::MEDIA_DEVICE_VIDEO_CAPTURE);
+ TabSpecificContentSettings* content_settings =
+ TabSpecificContentSettings::FromWebContents(
+ chrome::GetActiveWebContents(browser()));
MediaStreamDevicesController controller(
- browser()->profile(), request,
+ browser()->profile(), content_settings, request,
base::Bind(&MediaStreamDevicesControllerBrowserTest::Accept, this));
controller.DismissInfoBarAndTakeActionOnSettings();

Powered by Google App Engine
This is Rietveld 408576698