[android_webview] Fixes for wrap_content layouts.

android_webview/native/aw_contents.h

Index: android_webview/native/aw_contents.h
diff --git a/android_webview/native/aw_contents.h b/android_webview/native/aw_contents.h
index bdfb6aae8830780e7d8c5c210a3c5e45459a28df..4976ddbf89b30f64cad36e62ad6d59feb16090ab 100644
--- a/android_webview/native/aw_contents.h
+++ b/android_webview/native/aw_contents.h
@@ -164,11 +164,20 @@ class AwContents : public FindHelper::Listener,
   jint ReleasePopupAwContents(JNIEnv* env, jobject obj);
 
   void ScrollTo(JNIEnv* env, jobject obj, jint xPix, jint yPix);
-  void SetDipScale(JNIEnv* env, jobject obj, jfloat dipScale);
+  void SetDipScale(JNIEnv* env, jobject obj, jfloat dip_scale);
   void SetDisplayedPageScaleFactor(JNIEnv* env,
                                    jobject obj,
-                                   jfloat pageScaleFactor);
-
+                                   jfloat page_scale_factor);
+  void SetFixedLayoutOverride(JNIEnv* env,
+                              jobject obj,
+                              jboolean enable,
+                              jint width_dip,
+                              jint height_dip);
+  void SetViewportDipSizeOverride(JNIEnv* env,
+                                  jobject obj,
+                                  jboolean enable,
+                                  jint width_dip,
+                                  jint height_dip);
   void SetSaveFormData(bool enabled);
 
   // Sets the java delegate