chrome/browser/extensions/api/content_settings/content_settings_apitest.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/extensions/api/content_settings/content_settings_apitest.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/extensions/api/bookmarks/bookmarks_api.cc ('k') | chrome/browser/extensions/api/content_settings/content_settings_helpers.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

diff --git a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

index a424f836412e4cbe865b3d139828ea19fec6260c..dd20fba1f7ea0479c6851f7b83abb7392061fe0f 100644

--- a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

+++ b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

@@ -74,16 +74,16 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentSettings) {

EXPECT_FALSE(cookie_settings->IsReadingCookieAllowed(url, url));

EXPECT_EQ(CONTENT_SETTING_ALLOW,

map->GetContentSetting(

- url, url, CONTENT_SETTINGS_TYPE_IMAGES, ""));

+ url, url, CONTENT_SETTINGS_TYPE_IMAGES, std::string()));

EXPECT_EQ(CONTENT_SETTING_BLOCK,

map->GetContentSetting(

- url, url, CONTENT_SETTINGS_TYPE_JAVASCRIPT, ""));

+ url, url, CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string()));

EXPECT_EQ(CONTENT_SETTING_BLOCK,

map->GetContentSetting(

- url, url, CONTENT_SETTINGS_TYPE_PLUGINS, ""));

+ url, url, CONTENT_SETTINGS_TYPE_PLUGINS, std::string()));

EXPECT_EQ(CONTENT_SETTING_ALLOW,

map->GetContentSetting(

- url, url, CONTENT_SETTINGS_TYPE_POPUPS, ""));

+ url, url, CONTENT_SETTINGS_TYPE_POPUPS, std::string()));

#if 0

EXPECT_EQ(CONTENT_SETTING_BLOCK,

map->GetContentSetting(

@@ -91,7 +91,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentSettings) {

#endif

EXPECT_EQ(CONTENT_SETTING_BLOCK,

map->GetContentSetting(

- url, url, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, ""));

+ url, url, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string()));

}

// Flaky on the trybots. See http://crbug.com/96725.