Get rid of the ability to unregister preferences.

chrome/browser/ui/prefs/prefs_tab_helper_browsertest.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 "base/file_util.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_constants.h"
@@ skipping 51 matching lines @@
 // This migration moves the formerly "non-per-script" font prefs into the
 // per-script font maps, as the entry for "Common" script (Zyyy is the ISO 15924
 // script code for the Common script).
 //
 // In addition, it tests that the former migration of
 // webkit.webprefs.blahblah -> webkit.webprefs.global.blahblah
 // no longer occurs.
 IN_PROC_BROWSER_TEST_F(PrefsTabHelperBrowserTest, PrefsAreMigratedToFontMap) {
   PrefService* prefs = browser()->profile()->GetPrefs();
 
-  EXPECT_EQ(NULL, prefs->FindPreference(prefs::kGlobalDefaultCharset));
-  EXPECT_EQ(NULL, prefs->FindPreference(prefs::kWebKitGlobalDefaultFontSize));
-  EXPECT_EQ(NULL,
-            prefs->FindPreference(prefs::kWebKitGlobalDefaultFixedFontSize));
-  EXPECT_EQ(NULL, prefs->FindPreference(prefs::kWebKitGlobalMinimumFontSize));
-  EXPECT_EQ(NULL,
-            prefs->FindPreference(prefs::kWebKitGlobalMinimumLogicalFontSize));
-  EXPECT_EQ(NULL, prefs->FindPreference(prefs::kWebKitOldCursiveFontFamily));
-  EXPECT_EQ(NULL, prefs->FindPreference(prefs::kWebKitOldFantasyFontFamily));
-  EXPECT_EQ(NULL, prefs->FindPreference(prefs::kWebKitOldFixedFontFamily));
-  EXPECT_EQ(NULL, prefs->FindPreference(prefs::kWebKitOldSansSerifFontFamily));
-  EXPECT_EQ(NULL, prefs->FindPreference(prefs::kWebKitOldSerifFontFamily));
-  EXPECT_EQ(NULL, prefs->FindPreference(prefs::kWebKitOldStandardFontFamily));
+  EXPECT_TRUE(prefs->FindPreference(
+      prefs::kGlobalDefaultCharset)->IsDefaultValue());
+  EXPECT_TRUE(prefs->FindPreference(
+      prefs::kWebKitGlobalDefaultFontSize)->IsDefaultValue());
+  EXPECT_TRUE(prefs->FindPreference(
+      prefs::kWebKitGlobalDefaultFixedFontSize)->IsDefaultValue());
+  EXPECT_TRUE(prefs->FindPreference(
+      prefs::kWebKitGlobalMinimumFontSize)->IsDefaultValue());
+  EXPECT_TRUE(prefs->FindPreference(
+      prefs::kWebKitGlobalMinimumLogicalFontSize)->IsDefaultValue());
+  EXPECT_TRUE(prefs->FindPreference(
+      prefs::kWebKitOldCursiveFontFamily)->IsDefaultValue());
+  EXPECT_TRUE(prefs->FindPreference(
+      prefs::kWebKitOldFantasyFontFamily)->IsDefaultValue());
+  EXPECT_TRUE(prefs->FindPreference(
+      prefs::kWebKitOldFixedFontFamily)->IsDefaultValue());
+  EXPECT_TRUE(prefs->FindPreference(
+      prefs::kWebKitOldSansSerifFontFamily)->IsDefaultValue());
+  EXPECT_TRUE(prefs->FindPreference(
+      prefs::kWebKitOldSerifFontFamily)->IsDefaultValue());
+  EXPECT_TRUE(prefs->FindPreference(
+      prefs::kWebKitOldStandardFontFamily)->IsDefaultValue());
 
   EXPECT_EQ("ISO-8859-1", prefs->GetString(prefs::kDefaultCharset));
   EXPECT_EQ(42, prefs->GetInteger(prefs::kWebKitDefaultFontSize));
   EXPECT_EQ(42, prefs->GetInteger(prefs::kWebKitDefaultFixedFontSize));
   EXPECT_EQ(42, prefs->GetInteger(prefs::kWebKitMinimumFontSize));
   EXPECT_EQ(42, prefs->GetInteger(prefs::kWebKitMinimumLogicalFontSize));
   EXPECT_EQ("CursiveFontFamily",
             prefs->GetString(prefs::kWebKitCursiveFontFamily));
   EXPECT_EQ("FantasyFontFamily",
             prefs->GetString(prefs::kWebKitFantasyFontFamily));
@@ skipping 29 matching lines @@
 // pref mechanism, which has since been removed).
 //
 // In addition it tests the migration for font families:
 // webkit.webprefs.global.standard_font_family ->
 // webkit.webprefs.fonts.standard.Zyyy
 // This moves the formerly "non-per-script" font prefs into the per-script font
 // maps, as described in the comment for PrefsAreMigratedToFontMap.
 IN_PROC_BROWSER_TEST_F(PrefsTabHelperBrowserTest2, GlobalPrefsAreMigrated) {
   PrefService* prefs = browser()->profile()->GetPrefs();
 
-  EXPECT_EQ(NULL, prefs->FindPreference(prefs::kGlobalDefaultCharset));
-  EXPECT_EQ(NULL, prefs->FindPreference(prefs::kWebKitGlobalDefaultFontSize));
-  EXPECT_EQ(NULL,
-            prefs->FindPreference(prefs::kWebKitGlobalDefaultFixedFontSize));
-  EXPECT_EQ(NULL, prefs->FindPreference(prefs::kWebKitGlobalMinimumFontSize));
-  EXPECT_EQ(NULL,
-            prefs->FindPreference(prefs::kWebKitGlobalMinimumLogicalFontSize));
-  EXPECT_EQ(NULL, prefs->FindPreference(prefs::kWebKitGlobalCursiveFontFamily));
-  EXPECT_EQ(NULL, prefs->FindPreference(prefs::kWebKitGlobalFantasyFontFamily));
-  EXPECT_EQ(NULL, prefs->FindPreference(prefs::kWebKitGlobalFixedFontFamily));
-  EXPECT_EQ(NULL,
-            prefs->FindPreference(prefs::kWebKitGlobalSansSerifFontFamily));
-  EXPECT_EQ(NULL, prefs->FindPreference(prefs::kWebKitGlobalSerifFontFamily));
-  EXPECT_EQ(NULL,
-            prefs->FindPreference(prefs::kWebKitGlobalStandardFontFamily));
+  EXPECT_TRUE(prefs->FindPreference(
+      prefs::kGlobalDefaultCharset)->IsDefaultValue());
+  EXPECT_TRUE(prefs->FindPreference(
+      prefs::kWebKitGlobalDefaultFontSize)->IsDefaultValue());
+  EXPECT_TRUE(prefs->FindPreference(
+      prefs::kWebKitGlobalDefaultFixedFontSize)->IsDefaultValue());
+  EXPECT_TRUE(prefs->FindPreference(
+      prefs::kWebKitGlobalMinimumFontSize)->IsDefaultValue());
+  EXPECT_TRUE(prefs->FindPreference(
+      prefs::kWebKitGlobalMinimumLogicalFontSize)->IsDefaultValue());
+  EXPECT_TRUE(prefs->FindPreference(
+      prefs::kWebKitGlobalCursiveFontFamily)->IsDefaultValue());
+  EXPECT_TRUE(prefs->FindPreference(
+      prefs::kWebKitGlobalFantasyFontFamily)->IsDefaultValue());
+  EXPECT_TRUE(prefs->FindPreference(
+      prefs::kWebKitGlobalFixedFontFamily)->IsDefaultValue());
+  EXPECT_TRUE(prefs->FindPreference(
+      prefs::kWebKitGlobalSansSerifFontFamily)->IsDefaultValue());
+  EXPECT_TRUE(prefs->FindPreference(
+      prefs::kWebKitGlobalSerifFontFamily)->IsDefaultValue());
+  EXPECT_TRUE(prefs->FindPreference(
+      prefs::kWebKitGlobalStandardFontFamily)->IsDefaultValue());
 
   EXPECT_EQ("ISO-8859-1", prefs->GetString(prefs::kDefaultCharset));
   EXPECT_EQ(42, prefs->GetInteger(prefs::kWebKitDefaultFontSize));
   EXPECT_EQ(42,
             prefs->GetInteger(prefs::kWebKitDefaultFixedFontSize));
   EXPECT_EQ(42, prefs->GetInteger(prefs::kWebKitMinimumFontSize));
   EXPECT_EQ(42,
             prefs->GetInteger(prefs::kWebKitMinimumLogicalFontSize));
   EXPECT_EQ("CursiveFontFamily",
             prefs->GetString(prefs::kWebKitCursiveFontFamily));
   EXPECT_EQ("FantasyFontFamily",
             prefs->GetString(prefs::kWebKitFantasyFontFamily));
   // PictographFontFamily was added after the migration, so it never exists
   // in the old format (and consequently isn't in the test Preferences file).
   // So it doesn't need to be tested here.
   EXPECT_EQ("FixedFontFamily",
             prefs->GetString(prefs::kWebKitFixedFontFamily));
   EXPECT_EQ("SansSerifFontFamily",
             prefs->GetString(prefs::kWebKitSansSerifFontFamily));
   EXPECT_EQ("SerifFontFamily",
             prefs->GetString(prefs::kWebKitSerifFontFamily));
   EXPECT_EQ("StandardFontFamily",
             prefs->GetString(prefs::kWebKitStandardFontFamily));
 };