Simplify wrap_contents mode.

android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java

 // Copyright 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.
 
 package org.chromium.android_webview.test;
 
 import android.test.suitebuilder.annotation.SmallTest;
 import android.view.View;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.LinearLayout;
@@ skipping 325 matching lines @@
         assertZeroHeight(testContainerView);
 
         final double deviceDIPScale =
             DeviceDisplayInfo.create(testContainerView.getContext()).getDIPScale();
 
         final int contentWidthCss = 142;
         final int contentHeightCss = 180;
 
         final int expectedWidthCss =
             (int) Math.ceil(getRootLayoutWidthOnMainThread() / deviceDIPScale);
-        final int expectedHeightCss = contentHeightCss +
-            // The second div in the contents is styled to have 150% of the viewport height, hence
-            // the 1.5.
-            (int) (AwLayoutSizer.FIXED_LAYOUT_HEIGHT * 1.5);
+        final int expectedHeightCss = contentHeightCss;
 
         loadPageOfSizeAndWaitForSizeChange(testContainerView.getAwContents(),
                 mOnContentSizeChangedHelper, expectedWidthCss, contentHeightCss, true);
 
         waitForNoLayoutsPending();
         assertEquals(expectedWidthCss, mOnContentSizeChangedHelper.getWidth());
         assertEquals(expectedHeightCss, mOnContentSizeChangedHelper.getHeight());
     }
 
     @SmallTest
@@ skipping 39 matching lines @@
         mOnContentSizeChangedHelper.waitForCallback(contentSizeChangeCallCount);
 
         // As a result of calling the onSizeChanged method the layout size should be updated to
         // match the width of the webview and the text we previously loaded should reflow making the
         // contents width match the WebView width.
         assertEquals(expectedWidthCss, mOnContentSizeChangedHelper.getWidth());
         assertTrue(mOnContentSizeChangedHelper.getHeight() < narrowLayoutHeight);
         assertTrue(mOnContentSizeChangedHelper.getHeight() > 0);
     }
 }