chrome/browser/content_settings/content_settings_browsertest.cc - Issue 13145003: Rewrite std::string("") to std::string(), Linux edition.

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/content_settings/content_settings_browsertest.cc

Issue 13145003: Rewrite std::string("") to std::string(), Linux edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Ugh Created 7 years, 8 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/certificate_manager_model.cc ('k') | chrome/browser/content_settings/content_settings_internal_extension_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_browsertest.cc

diff --git a/chrome/browser/content_settings/content_settings_browsertest.cc b/chrome/browser/content_settings/content_settings_browsertest.cc

index 88c664cec732278c9cb84cd882aa236239d93ca2..f4105ad4e3b59d69b65cc1f030c9db1c9e3b81b7 100644

--- a/chrome/browser/content_settings/content_settings_browsertest.cc

+++ b/chrome/browser/content_settings/content_settings_browsertest.cc

@@ -338,12 +338,12 @@ IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, AllowException) {

browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(

CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_BLOCK);

- browser()->profile()->GetHostContentSettingsMap()->SetContentSetting(

- ContentSettingsPattern::FromURL(url),

- ContentSettingsPattern::Wildcard(),

- CONTENT_SETTINGS_TYPE_PLUGINS,

- "",

- CONTENT_SETTING_ALLOW);

+ browser()->profile()->GetHostContentSettingsMap()

+ ->SetContentSetting(ContentSettingsPattern::FromURL(url),

+ ContentSettingsPattern::Wildcard(),

+ CONTENT_SETTINGS_TYPE_PLUGINS,

+ std::string(),

+ CONTENT_SETTING_ALLOW);

string16 expected_title(ASCIIToUTF16("OK"));

content::TitleWatcher title_watcher(

@@ -357,12 +357,12 @@ IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, BlockException) {

GURL url = ui_test_utils::GetTestUrl(

base::FilePath(), base::FilePath().AppendASCII("clicktoplay.html"));