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

Unified Diff: chrome/browser/ui/website_settings/website_settings_unittest.cc

Issue 2419413002: Deleted CONTENT_SETTINGS_TYPE_FULLSCREEN and MOUSELOCK. (Closed)
Patch Set: Fix more things. Created 4 years, 1 month 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
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 3bd1a97a84f21d58a9f4894388c60854aa9428cc..5095f6e3b4b23ad1ac98479962e2a0ea25358720 100644
--- a/chrome/browser/ui/website_settings/website_settings_unittest.cc
+++ b/chrome/browser/ui/website_settings/website_settings_unittest.cc
@@ -268,48 +268,6 @@ TEST_F(WebsiteSettingsTest, OnPermissionsChanged) {
EXPECT_EQ(setting, CONTENT_SETTING_ALLOW);
}
-TEST_F(WebsiteSettingsTest, OnPermissionsChanged_Fullscreen) {
- // Setup site permissions.
- HostContentSettingsMap* content_settings =
- HostContentSettingsMapFactory::GetForProfile(profile());
- ContentSetting setting = content_settings->GetContentSetting(
- url(), url(), CONTENT_SETTINGS_TYPE_FULLSCREEN, std::string());
- EXPECT_EQ(setting, CONTENT_SETTING_ASK);
-
- EXPECT_CALL(*mock_ui(), SetIdentityInfo(_));
- EXPECT_CALL(*mock_ui(), SetCookieInfo(_));
- EXPECT_CALL(*mock_ui(), SetSelectedTab(
- WebsiteSettingsUI::TAB_ID_PERMISSIONS));
-
- // SetPermissionInfo() is called once initially, and then again every time
- // OnSitePermissionChanged() is called.
- EXPECT_CALL(*mock_ui(), SetPermissionInfoStub()).Times(3);
-
- // Execute code under tests.
- website_settings()->OnSitePermissionChanged(CONTENT_SETTINGS_TYPE_FULLSCREEN,
- CONTENT_SETTING_ALLOW);
-
- // Verify that the site permissions were changed correctly.
- setting = content_settings->GetContentSetting(
- url(), url(), CONTENT_SETTINGS_TYPE_FULLSCREEN, std::string());
- EXPECT_EQ(setting, CONTENT_SETTING_ALLOW);
-
- // ... and that the primary pattern must match the secondary one.
- setting = content_settings->GetContentSetting(
- url(), GURL("https://test.com"),
- CONTENT_SETTINGS_TYPE_FULLSCREEN, std::string());
- EXPECT_EQ(setting, CONTENT_SETTING_ASK);
-
-
- // Resetting the setting should move the permission back to ASK.
- website_settings()->OnSitePermissionChanged(CONTENT_SETTINGS_TYPE_FULLSCREEN,
- CONTENT_SETTING_ASK);
-
- setting = content_settings->GetContentSetting(
- url(), url(), CONTENT_SETTINGS_TYPE_FULLSCREEN, std::string());
- EXPECT_EQ(setting, CONTENT_SETTING_ASK);
-}
-
TEST_F(WebsiteSettingsTest, OnSiteDataAccessed) {
EXPECT_CALL(*mock_ui(), SetPermissionInfoStub());
EXPECT_CALL(*mock_ui(), SetIdentityInfo(_));

Powered by Google App Engine
This is Rietveld 408576698