[Android WebView] Never turn off viewport and fixed layout

content/browser/android/content_settings.cc

Index: content/browser/android/content_settings.cc
diff --git a/content/browser/android/content_settings.cc b/content/browser/android/content_settings.cc
index 3216ce6f06034fb5f815e2004b83653861f639d7..fb53d24cc7ee1448b7fa3e5784f035a3286517bc 100644
--- a/content/browser/android/content_settings.cc
+++ b/content/browser/android/content_settings.cc
@@ -285,7 +285,7 @@ void ContentSettings::SyncFromNativeImpl() {
   env->SetBooleanField(
       obj,
       field_ids_->use_wide_viewport,
-      prefs.viewport_enabled);
+      prefs.use_wide_viewport);
   CheckException(env);
 
   env->SetBooleanField(
@@ -415,9 +415,8 @@ void ContentSettings::SyncToNativeImpl() {
   prefs.databases_enabled = env->GetBooleanField(
       obj, field_ids_->database_enabled);
 
-  prefs.viewport_enabled = env->GetBooleanField(
-      obj, field_ids_->use_wide_viewport);
-  prefs.double_tap_to_zoom_enabled = prefs.viewport_enabled;
+  prefs.double_tap_to_zoom_enabled = prefs.use_wide_viewport =
+      env->GetBooleanField(obj, field_ids_->use_wide_viewport);
 
   prefs.initialize_at_minimum_page_scale = env->GetBooleanField(
       obj, field_ids_->load_with_overview_mode);