Plumb device scale adjustment separately.

android_webview/native/aw_settings.cc

 // Copyright (c) 2013 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 "android_webview/native/aw_settings.h"
 
 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
 #include "android_webview/native/aw_contents.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 180 matching lines @@
   jobject obj = scoped_obj.obj();
   if (!obj) return;
 
   PopulateFixedPreferences(web_prefs);
 
   web_prefs->text_autosizing_enabled =
       Java_AwSettings_getTextAutosizingEnabledLocked(env, obj);
 
   int text_size_percent = Java_AwSettings_getTextSizePercentLocked(env, obj);
   if (web_prefs->text_autosizing_enabled) {
-    web_prefs->text_autosizing_font_scale_factor = text_size_percent / 100.0f;
+    web_prefs->font_scale_factor = text_size_percent / 100.0f;
     web_prefs->force_enable_zoom = text_size_percent >= 130;
     // Use the default zoom factor value when Text Autosizer is turned on.
     render_view_host_ext->SetTextZoomFactor(1);
   } else {
     web_prefs->force_enable_zoom = false;
     render_view_host_ext->SetTextZoomFactor(text_size_percent / 100.0f);
   }
 
   web_prefs->standard_font_family_map[webkit_glue::kCommonScript] =
       ConvertJavaStringToUTF16(
@@ skipping 109 matching lines @@
 static jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) {
   return base::android::ConvertUTF8ToJavaString(
       env, content::GetUserAgent(GURL())).Release();
 }
 
 bool RegisterAwSettings(JNIEnv* env) {
   return RegisterNativesImpl(env) >= 0;
 }
 
 }  // namespace android_webview