Migrate WebKit "global script" font prefs.

chrome/browser/ui/prefs/prefs_tab_helper_browsertest2.cc

Index: chrome/browser/ui/prefs/prefs_tab_helper_browsertest2.cc
diff --git a/chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc b/chrome/browser/ui/prefs/prefs_tab_helper_browsertest2.cc
similarity index 55%
copy from chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc
copy to chrome/browser/ui/prefs/prefs_tab_helper_browsertest2.cc
index 890a33ae8faf46ba87d97c273dd3f89e90593be6..1770976d3186502de1f848f3b7e9a28846ef4e80 100644
--- a/chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc
+++ b/chrome/browser/ui/prefs/prefs_tab_helper_browsertest2.cc
@@ -12,7 +12,7 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 
-class PrefsTabHelperBrowserTest : public InProcessBrowserTest {
+class PrefsTabHelperBrowserTest2 : public InProcessBrowserTest {
  protected:
   virtual bool SetUpUserDataDirectory() OVERRIDE {
     FilePath test_data_directory;
@@ -27,7 +27,7 @@ class PrefsTabHelperBrowserTest : public InProcessBrowserTest {
     FilePath non_global_pref_file;
     non_global_pref_file = test_data_directory
         .AppendASCII("profiles")
-        .AppendASCII("webkit_global_migration")
+        .AppendASCII("webkit_global_reverse_migration")
         .AppendASCII("Default")
         .Append(chrome::kPreferencesFilename);
     if (!file_util::PathExists(non_global_pref_file)) {
@@ -52,38 +52,28 @@ class PrefsTabHelperBrowserTest : public InProcessBrowserTest {
   }
 };
 
-IN_PROC_BROWSER_TEST_F(PrefsTabHelperBrowserTest, NonGlobalPrefsAreMigrated) {
+IN_PROC_BROWSER_TEST_F(PrefsTabHelperBrowserTest2, GlobalPrefsAreMigrated) {

[tony, 2012/04/27 17:22:18]

Rather than making a separate test file, it seems like you could make this a
separate test case in prefs_tab_helper_browsertest.cc to increase code sharing.

[falken, 2012/05/09 06:48:08]

I think I need the separate file since it uses a different Preferences file in
SetupDataDirectory.

   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(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::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));
   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));
+};