Migrate WebKit "global script" font prefs.

chrome/browser/chrome_content_browser_client.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 "chrome/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 285 matching lines @@
 
 // Fills |map| with the per-script font prefs under path |map_name|.
 void FillFontFamilyMap(const PrefService* prefs,
                        const char* map_name,
                        WebPreferences::ScriptFontFamilyMap* map) {
   for (size_t i = 0; i < prefs::kWebKitScriptsForFontFamilyMapsLength; ++i) {
     const char* script = prefs::kWebKitScriptsForFontFamilyMaps[i];
     std::string pref_name = base::StringPrintf("%s.%s", map_name, script);
     std::string font_family = prefs->GetString(pref_name.c_str());
     if (!font_family.empty())
-      map->push_back(std::make_pair(script, UTF8ToUTF16(font_family)));
+      (*map)[script] = UTF8ToUTF16(font_family);
   }
 }
 
 }  // namespace
 
 namespace chrome {
 
 ChromeContentBrowserClient::ChromeContentBrowserClient() {
   for (size_t i = 0; i < arraysize(kPredefinedAllowedSocketOrigins); ++i)
     allowed_socket_origins_.insert(kPredefinedAllowedSocketOrigins[i]);
@@ skipping 1004 matching lines @@
   const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
   return !browser_command_line.HasSwitch(switches::kChromeFrame);
 }
 
 void ChromeContentBrowserClient::OverrideWebkitPrefs(
     RenderViewHost* rvh, const GURL& url, WebPreferences* web_prefs) {
   Profile* profile = Profile::FromBrowserContext(
       rvh->GetProcess()->GetBrowserContext());
   PrefService* prefs = profile->GetPrefs();
 
-  web_prefs->standard_font_family =
-      UTF8ToUTF16(prefs->GetString(prefs::kWebKitGlobalStandardFontFamily));
-  web_prefs->fixed_font_family =
-      UTF8ToUTF16(prefs->GetString(prefs::kWebKitGlobalFixedFontFamily));
-  web_prefs->serif_font_family =
-      UTF8ToUTF16(prefs->GetString(prefs::kWebKitGlobalSerifFontFamily));
-  web_prefs->sans_serif_font_family =
-      UTF8ToUTF16(prefs->GetString(prefs::kWebKitGlobalSansSerifFontFamily));
-  web_prefs->cursive_font_family =
-      UTF8ToUTF16(prefs->GetString(prefs::kWebKitGlobalCursiveFontFamily));
-  web_prefs->fantasy_font_family =
-      UTF8ToUTF16(prefs->GetString(prefs::kWebKitGlobalFantasyFontFamily));
-
   FillFontFamilyMap(prefs, prefs::kWebKitStandardFontFamilyMap,
                     &web_prefs->standard_font_family_map);
   FillFontFamilyMap(prefs, prefs::kWebKitFixedFontFamilyMap,
                     &web_prefs->fixed_font_family_map);
   FillFontFamilyMap(prefs, prefs::kWebKitSerifFontFamilyMap,
                     &web_prefs->serif_font_family_map);
   FillFontFamilyMap(prefs, prefs::kWebKitSansSerifFontFamilyMap,
                     &web_prefs->sans_serif_font_family_map);
   FillFontFamilyMap(prefs, prefs::kWebKitCursiveFontFamilyMap,
                     &web_prefs->cursive_font_family_map);
@@ skipping 270 matching lines @@
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ChromeContentBrowserClient::GetCryptoPasswordDelegate(
         const GURL& url) {
   return browser::NewCryptoModuleBlockingDialogDelegate(
       browser::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 }  // namespace chrome