Remove font_scale_factor_quirk (no longer used).

BUG=

Review URL: https://codereview.chromium.org/48353006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231706 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 2 insertions, 15 deletions

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index e9ae623..c7b991c 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -594,13 +594,7 @@ void HandleSingleTabModeBlockOnUIThread(const BlockedWindowParams& params) {
   SingleTabModeTabHelper::FromWebContents(web_contents)->HandleOpenUrl(params);
 }
 
-float GetFontScaleMultiplier(const PrefService* prefs) {
-  if (prefs->GetBoolean(prefs::kWebKitFontScaleFactorQuirk)) {
-    // The value of kWebKitFontScaleFactor passed by Chrome for Android already
-    // includes the multiplier.
-    return 1.0f;
-  }
-
+float GetFontScaleMultiplier() {
   static const float kMinFSM = 1.05f;
   static const int kWidthForMinFSM = 320;
   static const float kMaxFSM = 1.3f;
@@ -2227,7 +2221,7 @@ void ChromeContentBrowserClient::OverrideWebkitPrefs(
 #if defined(OS_ANDROID)
   web_prefs->text_autosizing_font_scale_factor =
       static_cast<float>(prefs->GetDouble(prefs::kWebKitFontScaleFactor)) *
-      GetFontScaleMultiplier(prefs);
+      GetFontScaleMultiplier();
   web_prefs->force_enable_zoom =
       prefs->GetBoolean(prefs::kWebKitForceEnableZoom);
 #endif
diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc
index a818cb6..8b14bc3 100644
--- a/chrome/browser/ui/prefs/prefs_tab_helper.cc
+++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc
@@ -444,10 +444,6 @@ void PrefsTabHelper::RegisterProfilePrefs(
       1.0,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterBooleanPref(
-      prefs::kWebKitFontScaleFactorQuirk,
-      false,
-      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-  registry->RegisterBooleanPref(
       prefs::kWebKitForceEnableZoom,
       pref_defaults.force_enable_zoom,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 88beefd..3bbb690 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -256,8 +256,6 @@ const char kWebKitAllowRunningInsecureContent[] =
     "webkit.webprefs.allow_running_insecure_content";
 #if defined(OS_ANDROID)
 const char kWebKitFontScaleFactor[] = "webkit.webprefs.font_scale_factor";
-const char kWebKitFontScaleFactorQuirk[] =
-    "webkit.webprefs.font_scale_factor_quirk";
 const char kWebKitForceEnableZoom[] = "webkit.webprefs.force_enable_zoom";
 const char kWebKitPasswordEchoEnabled[] =
     "webkit.webprefs.password_echo_enabled";
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 665b429..e766126 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -126,7 +126,6 @@ extern const char kWebKitAllowDisplayingInsecureContent[];
 extern const char kWebKitAllowRunningInsecureContent[];
 #if defined(OS_ANDROID)
 extern const char kWebKitFontScaleFactor[];
-extern const char kWebKitFontScaleFactorQuirk[];
 extern const char kWebKitForceEnableZoom[];
 extern const char kWebKitPasswordEchoEnabled[];
 #endif