| Index: android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
|
| diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
|
| index ed6ca7182f7d40d918fb2ac9c65a145a6b3c0eae..78a5e6507a3ace47ab1c3dd2e9c04825e993ac1c 100644
|
| --- a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
|
| +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
|
| @@ -1350,15 +1350,20 @@ public class AwSettingsTest extends AwTestBase {
|
| }
|
|
|
| private String getData() {
|
| + // Add a sequence number as a comment to ensure WebView does not do
|
| + // something special for the same page load, for instance, restoring
|
| + // user state like a scroll position.
|
| return "<html><head>"
|
| + (mWithViewPortTag ? "<meta name='viewport' content='width=3000' />" : "")
|
| - + "</head>"
|
| - + "<body></body></html>";
|
| + + "</head><body><!-- "
|
| + + mDataSequence++
|
| + + " --></body></html>";
|
| }
|
|
|
| private final boolean mWithViewPortTag;
|
| private boolean mExpectScaleChange;
|
| private int mOnScaleChangedCallCount;
|
| + private int mDataSequence;
|
| }
|
|
|
| class AwSettingsForceZeroLayoutHeightTestHelper extends AwSettingsTestHelper<Boolean> {
|
|
|