Use contents size for android_webview layout.

android_webview/native/aw_settings.cc

Index: android_webview/native/aw_settings.cc
diff --git a/android_webview/native/aw_settings.cc b/android_webview/native/aw_settings.cc
index 46651f370e7ef8ee4385ab95c9da80554c86fa18..f710c8303b3c392809b62b970ef13663a03973a3 100644
--- a/android_webview/native/aw_settings.cc
+++ b/android_webview/native/aw_settings.cc
@@ -72,8 +72,8 @@ void AwSettings::UpdateEverythingLocked(JNIEnv* env, jobject obj) {
   UpdateWebkitPreferencesLocked(env, obj);
   UpdateUserAgentLocked(env, obj);
   ResetScrollAndScaleState(env, obj);
-  UpdatePreferredSizeMode();
   UpdateFormDataPreferencesLocked(env, obj);
+  UpdateContentSizeNotificationMode(env, obj);
 }
 
 void AwSettings::UpdateUserAgentLocked(JNIEnv* env, jobject obj) {
@@ -230,10 +230,8 @@ void AwSettings::UpdateInitialPageScaleLocked(JNIEnv* env, jobject obj) {
   }
 }
 
-void AwSettings::UpdatePreferredSizeMode() {
-  if (web_contents()->GetRenderViewHost()) {
-    web_contents()->GetRenderViewHost()->EnablePreferredSizeMode();
-  }
+void AwSettings::UpdateContentSizeNotificationMode(JNIEnv* env, jobject obj) {
+  GetAwRenderViewHostExt()->EnableContentsSizeNotifications();
 }
 
 void AwSettings::UpdateFormDataPreferencesLocked(JNIEnv* env, jobject obj) {