Migrate WebKit "global script" font prefs.

chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc

Index: chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc
diff --git a/chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc b/chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc
index 890a33ae8faf46ba87d97c273dd3f89e90593be6..b336c90b4dd228f85e7f93466f0d3981f197021d 100644
--- a/chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc
+++ b/chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc
@@ -52,6 +52,10 @@ class PrefsTabHelperBrowserTest : public InProcessBrowserTest {
   }
 };
 
+// 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();
 
@@ -60,12 +64,6 @@ IN_PROC_BROWSER_TEST_F(PrefsTabHelperBrowserTest, NonGlobalPrefsAreMigrated) {
   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));
@@ -74,16 +72,29 @@ IN_PROC_BROWSER_TEST_F(PrefsTabHelperBrowserTest, NonGlobalPrefsAreMigrated) {
   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));
+};