[android_webview] Fixes for wrap_content layouts.

content/browser/android/content_view_core_impl.cc

Index: content/browser/android/content_view_core_impl.cc
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index e5600d3582b5dc1747d5d9a07f626b175bd504db..70d98b3b869e909cbdb83275a2b0068d53117e18 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -658,6 +658,9 @@ gfx::Size ContentViewCoreImpl::GetViewportSizeOffsetPix() const {
 }
 
 gfx::Size ContentViewCoreImpl::GetViewportSizeDip() const {
+  if (!viewport_dip_size_override_.IsEmpty())
+    return viewport_dip_size_override_;
+
   return gfx::ToCeiledSize(
       gfx::ScaleSize(GetViewportSizePix(), 1.0f / GetDpiScale()));
 }
@@ -876,6 +879,11 @@ void ContentViewCoreImpl::RequestContentClipping(
     rwhv->RequestContentClipping(clipping, content_size);
 }
 
+void ContentViewCoreImpl::SetViewportSizeDipOverride(
+    const gfx::Size& viewport_size) {
+  viewport_dip_size_override_ = viewport_size;
+}
+
 jboolean ContentViewCoreImpl::SendMouseMoveEvent(JNIEnv* env,
                                                  jobject obj,
                                                  jlong time_ms,