Deleted CONTENT_SETTINGS_TYPE_FULLSCREEN and MOUSELOCK.

chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/content_settings/core/browser/content_settings_pref_provider.h"
 
 #include <memory>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 146 matching lines @@
 #if !defined(OS_ANDROID)
   prefs->Set(kMouselockPrefPath, pref_data);
 #endif
   prefs->Set(kGeolocationPrefPath, pref_data);
 
   // Instantiate a new PrefProvider here, because we want to test the
   // constructor's behavior after setting the above.
   PrefProvider provider(prefs, false);
   provider.ShutdownOnUIThread();
 
-  // Check that fullscreen and mouselock have been reset back to defaults.
-  // TODO(mgiuca): These should be fully deleted, except that they keep being
-  // recreated due to the content settings enum still existing. Delete the enum,
-  // then update this test to expect full deletion. https://crbug.com/591896.
-  // EXPECT_FALSE(prefs->HasPrefPath(kFullscreenPrefPath));
-  // EXPECT_FALSE(prefs->HasPrefPath(kMouselockPrefPath));
-  GURL primary_url("http://example.com/");
-  EXPECT_EQ(CONTENT_SETTING_DEFAULT,
-            TestUtils::GetContentSetting(&provider, primary_url, primary_url,
-                                         CONTENT_SETTINGS_TYPE_FULLSCREEN,
-                                         std::string(), false));
+  // Check that fullscreen and mouselock have been deleted.
+  EXPECT_FALSE(prefs->HasPrefPath(kFullscreenPrefPath));
 #if !defined(OS_ANDROID)
-  EXPECT_EQ(CONTENT_SETTING_DEFAULT,
-            TestUtils::GetContentSetting(&provider, primary_url, primary_url,
-                                         CONTENT_SETTINGS_TYPE_MOUSELOCK,
-                                         std::string(), false));
+  EXPECT_FALSE(prefs->HasPrefPath(kMouselockPrefPath));
 #endif
   EXPECT_TRUE(prefs->HasPrefPath(kGeolocationPrefPath));
+  GURL primary_url("http://example.com/");
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             TestUtils::GetContentSetting(&provider, primary_url, primary_url,
                                          CONTENT_SETTINGS_TYPE_GEOLOCATION,
                                          std::string(), false));
 }
 
 // Test for regression in which the PrefProvider modified the user pref store
 // of the OTR unintentionally: http://crbug.com/74466.
 TEST_F(PrefProviderTest, Incognito) {
   PersistentPrefStore* user_prefs = new TestingPrefStore();
@@ skipping 383 matching lines @@
   for (const char* pref : nonempty_prefs) {
     DictionaryPrefUpdate update(&prefs, pref);
     const base::DictionaryValue* dictionary = update.Get();
     EXPECT_EQ(1u, dictionary->size());
   }
 
   provider.ShutdownOnUIThread();
 }
 
 }  // namespace content_settings