chrome/browser/policy/policy_browsertest.cc - Issue 440423003: Clean content_settings_pattern_parser.* from unnecessary dependencies.

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 440423003: Clean content_settings_pattern_parser.* from unnecessary dependencies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 4 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/content_settings/content_settings_details.h ('K') | « chrome/browser/plugins/plugin_info_message_filter_unittest.cc ('k') | chrome/browser/profile_resetter/profile_resetter_unittest.cc » ('j') | chrome/common/chrome_content_settings_client.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 bc4bc930ab5133bc9c2839738c26540fa5a3e2e8..05bac8f817d5c928408f3530b4623006a3ebf77b 100644

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

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

@@ -69,6 +69,7 @@

#include "chrome/browser/ui/omnibox/omnibox_edit_model.h"

#include "chrome/browser/ui/omnibox/omnibox_view.h"

#include "chrome/browser/ui/tabs/tab_strip_model.h"

+#include "chrome/common/chrome_content_settings_client.h"

#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/content_settings.h"

@@ -2928,7 +2929,9 @@ class MediaStreamDevicesControllerBrowserTest

list->AppendString(allow_rule);

request_url_allowed_via_whitelist_ = true;

} else {

- list->AppendString(ContentSettingsPattern::Wildcard().ToString());

+ content_settings::ChromeContentSettingsClient client;

+ list->AppendString(

+ ContentSettingsPattern::Wildcard().ToString(&client));

// We should ignore all wildcard entries in the whitelist, so even

// though we've added an entry, it should be ignored and our expectation

// is that the request has not been allowed via the whitelist.