diff options
Diffstat (limited to 'chrome/browser/ui/website_settings/website_settings_unittest.cc')
| -rw-r--r-- | chrome/browser/ui/website_settings/website_settings_unittest.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/chrome/browser/ui/website_settings/website_settings_unittest.cc b/chrome/browser/ui/website_settings/website_settings_unittest.cc index 4fe881a..8f486af 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); } |