Migrate WebKit "global script" font prefs.

chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc

 // Copyright (c) 2011 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 34 matching lines @@
 #if defined(OS_WIN)
     // 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
+// this will soon 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(NULL, prefs->FindPreference(prefs::kWebKitCursiveFontFamily));
-  EXPECT_EQ(NULL, prefs->FindPreference(prefs::kWebKitFantasyFontFamily));
-  EXPECT_EQ(NULL, prefs->FindPreference(prefs::kWebKitFixedFontFamily));
-  EXPECT_EQ(NULL, prefs->FindPreference(prefs::kWebKitSansSerifFontFamily));
-  EXPECT_EQ(NULL, prefs->FindPreference(prefs::kWebKitSerifFontFamily));
-  EXPECT_EQ(NULL, prefs->FindPreference(prefs::kWebKitStandardFontFamily));
 
   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
+IN_PROC_BROWSER_TEST_F(PrefsTabHelperBrowserTest, PrefsAreMigratedToFontMap) {
+  PrefService* prefs = browser()->profile()->GetPrefs();
+
+  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("CursiveFontFamily",
-            prefs->GetString(prefs::kWebKitGlobalCursiveFontFamily));
+            prefs->GetString(prefs::kWebKitCursiveFontFamily));
   EXPECT_EQ("FantasyFontFamily",
-            prefs->GetString(prefs::kWebKitGlobalFantasyFontFamily));
+            prefs->GetString(prefs::kWebKitFantasyFontFamily));
   EXPECT_EQ("FixedFontFamily",
-            prefs->GetString(prefs::kWebKitGlobalFixedFontFamily));
+            prefs->GetString(prefs::kWebKitFixedFontFamily));
   EXPECT_EQ("SansSerifFontFamily",
-            prefs->GetString(prefs::kWebKitGlobalSansSerifFontFamily));
+            prefs->GetString(prefs::kWebKitSansSerifFontFamily));
   EXPECT_EQ("SerifFontFamily",
-            prefs->GetString(prefs::kWebKitGlobalSerifFontFamily));
+            prefs->GetString(prefs::kWebKitSerifFontFamily));
   EXPECT_EQ("StandardFontFamily",
-            prefs->GetString(prefs::kWebKitGlobalStandardFontFamily));
-}
+            prefs->GetString(prefs::kWebKitStandardFontFamily));
+};