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

Unified Diff: chrome/browser/ui/website_settings/website_settings_unittest.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/ui/website_settings/website_settings.cc ('k') | chrome/browser/ui/webui/about_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/website_settings/website_settings_unittest.cc
diff --git a/chrome/browser/ui/website_settings/website_settings_unittest.cc b/chrome/browser/ui/website_settings/website_settings_unittest.cc
index 4fe881acec7b07033fa8a61fa3474ece24fe4efa..8f486afc1cd71a845f4e57887b275f2e77c7557f 100644
--- a/chrome/browser/ui/website_settings/website_settings_unittest.cc
+++ b/chrome/browser/ui/website_settings/website_settings_unittest.cc
@@ -165,22 +165,22 @@ TEST_F(WebsiteSettingsTest, OnPermissionsChanged) {
HostContentSettingsMap* content_settings =
profile()->GetHostContentSettingsMap();
ContentSetting setting = content_settings->GetContentSetting(
- url(), url(), CONTENT_SETTINGS_TYPE_POPUPS, "");
+ url(), url(), CONTENT_SETTINGS_TYPE_POPUPS, std::string());
EXPECT_EQ(setting, CONTENT_SETTING_BLOCK);
setting = content_settings->GetContentSetting(
- url(), url(), CONTENT_SETTINGS_TYPE_PLUGINS, "");
+ url(), url(), CONTENT_SETTINGS_TYPE_PLUGINS, std::string());
EXPECT_EQ(setting, CONTENT_SETTING_ALLOW);
setting = content_settings->GetContentSetting(
- url(), url(), CONTENT_SETTINGS_TYPE_GEOLOCATION, "");
+ url(), url(), CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string());
EXPECT_EQ(setting, CONTENT_SETTING_ASK);
setting = content_settings->GetContentSetting(
- url(), url(), CONTENT_SETTINGS_TYPE_NOTIFICATIONS, "");
+ url(), url(), CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string());
EXPECT_EQ(setting, CONTENT_SETTING_ASK);
setting = content_settings->GetContentSetting(
- url(), url(), CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, "");
+ url(), url(), CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string());
EXPECT_EQ(setting, CONTENT_SETTING_ASK);
setting = content_settings->GetContentSetting(
- url(), url(), CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, "");
+ url(), url(), CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string());
EXPECT_EQ(setting, CONTENT_SETTING_ASK);
EXPECT_CALL(*mock_ui(), SetIdentityInfo(_));
@@ -212,22 +212,22 @@ TEST_F(WebsiteSettingsTest, OnPermissionsChanged) {
// Verify that the site permissions were changed correctly.
setting = content_settings->GetContentSetting(
- url(), url(), CONTENT_SETTINGS_TYPE_POPUPS, "");
+ url(), url(), CONTENT_SETTINGS_TYPE_POPUPS, std::string());
EXPECT_EQ(setting, CONTENT_SETTING_ALLOW);
setting = content_settings->GetContentSetting(
- url(), url(), CONTENT_SETTINGS_TYPE_PLUGINS, "");
+ url(), url(), CONTENT_SETTINGS_TYPE_PLUGINS, std::string());
EXPECT_EQ(setting, CONTENT_SETTING_BLOCK);
setting = content_settings->GetContentSetting(
- url(), url(), CONTENT_SETTINGS_TYPE_GEOLOCATION, "");
+ url(), url(), CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string());
EXPECT_EQ(setting, CONTENT_SETTING_ALLOW);
setting = content_settings->GetContentSetting(
- url(), url(), CONTENT_SETTINGS_TYPE_NOTIFICATIONS, "");
+ url(), url(), CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string());
EXPECT_EQ(setting, CONTENT_SETTING_ALLOW);
setting = content_settings->GetContentSetting(
- url(), url(), CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, "");
+ url(), url(), CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string());
EXPECT_EQ(setting, CONTENT_SETTING_ALLOW);
setting = content_settings->GetContentSetting(
- url(), url(), CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, "");
+ url(), url(), CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string());
EXPECT_EQ(setting, CONTENT_SETTING_ALLOW);
}
« no previous file with comments | « chrome/browser/ui/website_settings/website_settings.cc ('k') | chrome/browser/ui/webui/about_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698