Migrate the rest of the "global" prefs.

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 "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_constants.h"
@@ skipping 38 matching lines @@
     // Make the copy writable.  On POSIX we assume the umask allows files
     // we create to be writable.
     if (!::SetFileAttributesW(default_pref_file.value().c_str(),
                               FILE_ATTRIBUTE_NORMAL)) return false;
 #endif
     return true;
   }
 };
 
 // This tests migration like:
-// webkit.webprefs.default_charset -> webkit.webprefs.global.default_charset
-// This was needed for per-tab prefs, which have since been removed. So
-// eventually this migration will be replaced with the reverse migration.
-IN_PROC_BROWSER_TEST_F(PrefsTabHelperBrowserTest, NonGlobalPrefsAreMigrated) {
-  PrefService* prefs = browser()->profile()->GetPrefs();
-
-  EXPECT_EQ(NULL, prefs->FindPreference(prefs::kDefaultCharset));
-  EXPECT_EQ(NULL, prefs->FindPreference(prefs::kWebKitDefaultFontSize));
-  EXPECT_EQ(NULL, prefs->FindPreference(prefs::kWebKitDefaultFixedFontSize));
-  EXPECT_EQ(NULL, prefs->FindPreference(prefs::kWebKitMinimumFontSize));
-  EXPECT_EQ(NULL, prefs->FindPreference(prefs::kWebKitMinimumLogicalFontSize));
-
-  EXPECT_EQ("ISO-8859-1", prefs->GetString(prefs::kGlobalDefaultCharset));
-  EXPECT_EQ(42, prefs->GetInteger(prefs::kWebKitGlobalDefaultFontSize));
-  EXPECT_EQ(42,
-            prefs->GetInteger(prefs::kWebKitGlobalDefaultFixedFontSize));
-  EXPECT_EQ(42, prefs->GetInteger(prefs::kWebKitGlobalMinimumFontSize));
-  EXPECT_EQ(42,
-            prefs->GetInteger(prefs::kWebKitGlobalMinimumLogicalFontSize));
-};
-
-// This tests migration like:
 // webkit.webprefs.standard_font_family -> webkit.webprefs.fonts.standard.Zyyy
 // 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_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));
   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));
 };
 
 class PrefsTabHelperBrowserTest2 : public PrefsTabHelperBrowserTest {
  protected:
   virtual FilePath GetPreferencesFilePath() OVERRIDE {
     FilePath test_data_directory;
     PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory);
     return test_data_directory
         .AppendASCII("profiles")
         .AppendASCII("webkit_global_reverse_migration")
         .AppendASCII("Default")
         .Append(chrome::kPreferencesFilename);
   }
 };
 
 // This tests migration like:
+// webkit.webprefs.global.blahblah -> webkit.webprefs.blahblah
+// This undoes the migration to "global" names (originally done for the per-tab
+// 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 undoes the migration to "global" names (originally done for the per-tab
-// pref mechanism, which has since been removed). In addition, it moves the
-// formerly "non-per-script" font prefs into the per-script font maps, as
-// described in the comment for PrefsAreMigratedToFontMap.
+// 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_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));
   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));
 };