Don't look up font size preferences on Android.

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index be3a5cd9e2e95f4c774cfcb4c375dee6865fefae..f9e976a3262c4740f56fa73b777a7a2981748bc1 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -2541,8 +2541,8 @@ void ChromeContentBrowserClient::OverrideWebkitPrefs(
       rvh->GetProcess()->GetBrowserContext());
   PrefService* prefs = profile->GetPrefs();
 
-  // Fill per-script font preferences. These are not registered on Android
-  // - http://crbug.com/308033.
+// Fill font preferences. These are not registered on Android
+// - http://crbug.com/308033, http://crbug.com/696364.
 #if !defined(OS_ANDROID)
   FontFamilyCache::FillFontFamilyMap(profile,
                                      prefs::kWebKitStandardFontFamilyMap,
@@ -2565,7 +2565,6 @@ void ChromeContentBrowserClient::OverrideWebkitPrefs(
   FontFamilyCache::FillFontFamilyMap(profile,
                                      prefs::kWebKitPictographFontFamilyMap,
                                      &web_prefs->pictograph_font_family_map);
-#endif
 
   web_prefs->default_font_size =
       prefs->GetInteger(prefs::kWebKitDefaultFontSize);
@@ -2575,6 +2574,7 @@ void ChromeContentBrowserClient::OverrideWebkitPrefs(
       prefs->GetInteger(prefs::kWebKitMinimumFontSize);
   web_prefs->minimum_logical_font_size =
       prefs->GetInteger(prefs::kWebKitMinimumLogicalFontSize);
+#endif
 
   web_prefs->default_encoding = prefs->GetString(prefs::kDefaultCharset);