Migrate the rest of the "global" prefs.

chrome/browser/prefs/pref_service_unittest.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 <string>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
@@ skipping 350 matching lines @@
 
     // Supply our own profile so we use the correct profile data. The test
     // harness is not supposed to overwrite a profile if it's already created.
 
     // Set some (WebKit) user preferences.
     TestingPrefService* pref_services = profile()->GetTestingPrefService();
 #if defined(TOOLKIT_GTK)
     pref_services->SetUserPref(prefs::kUsesSystemTheme,
                                Value::CreateBooleanValue(false));
 #endif
-    pref_services->SetUserPref(prefs::kGlobalDefaultCharset,
+    pref_services->SetUserPref(prefs::kDefaultCharset,
                                Value::CreateStringValue("utf8"));
-    pref_services->SetUserPref(prefs::kWebKitGlobalDefaultFontSize,
+    pref_services->SetUserPref(prefs::kWebKitDefaultFontSize,
                                Value::CreateIntegerValue(20));
     pref_services->SetUserPref(prefs::kWebKitTextAreasAreResizable,
                                Value::CreateBooleanValue(false));
     pref_services->SetUserPref(prefs::kWebKitUsesUniversalDetector,
                                Value::CreateBooleanValue(true));
     pref_services->SetUserPref("webkit.webprefs.foo",
                                Value::CreateStringValue("bar"));
   }
 
  private:
@@ skipping 17 matching lines @@
   const char kDefaultFont[] = "Times";
 #elif defined(OS_CHROMEOS)
   const char kDefaultFont[] = "Tinos";
 #else
   const char kDefaultFont[] = "Times New Roman";
 #endif
   EXPECT_EQ(ASCIIToUTF16(kDefaultFont),
             webkit_prefs.standard_font_family_map[prefs::kWebKitCommonScript]);
   EXPECT_TRUE(webkit_prefs.javascript_enabled);
 }