chrome/browser/policy/policy_browsertest.cc - Issue 12092045: Revert 179093

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 12092045: Revert 179093 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1397/src/

Patch Set: 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

« no previous file with comments | « chrome/browser/media/media_stream_devices_controller.cc ('k') | chrome/browser/ui/content_settings/content_setting_bubble_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/policy_browsertest.cc

===================================================================

--- chrome/browser/policy/policy_browsertest.cc (revision 179367)

+++ chrome/browser/policy/policy_browsertest.cc (working copy)

@@ -24,7 +24,6 @@

#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"

@@ -1781,13 +1780,8 @@

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(),

- content_settings,

- request,

+ browser()->profile(), request,

base::Bind(&MediaStreamDevicesControllerBrowserTest::Accept, this));

controller.DismissInfoBarAndTakeActionOnSettings();

@@ -1799,11 +1793,8 @@