Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2076)

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java

Issue 1408393003: Propagate pageScaleFactor to GuestViews (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove redundant initialization of AwLayoutSizer's page scale factor in tests Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
index 2c3bc37abd60571b1d5283d8ef9670ac8672b6a1..abf9094a305ef2e87ce205763c5e384c976e8a82 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
@@ -151,9 +151,7 @@ public class AndroidViewIntegrationTest extends AwTestBase {
assertZeroHeight(testContainerView);
final int contentSizeChangeCallCount = mOnContentSizeChangedHelper.getCallCount();
- final int pageScaleChangeCallCount = mOnPageScaleChangedHelper.getCallCount();
loadUrlAsync(testContainerView.getAwContents(), CommonResources.ABOUT_HTML);
- mOnPageScaleChangedHelper.waitForCallback(pageScaleChangeCallCount);
mOnContentSizeChangedHelper.waitForCallback(contentSizeChangeCallCount);
assertTrue(mOnContentSizeChangedHelper.getHeight() > 0);
}
@@ -173,9 +171,7 @@ public class AndroidViewIntegrationTest extends AwTestBase {
assertZeroHeight(testContainerView);
final int contentSizeChangeCallCount = mOnContentSizeChangedHelper.getCallCount();
- final int pageScaleChangeCallCount = mOnPageScaleChangedHelper.getCallCount();
loadUrlAsync(testContainerView.getAwContents(), CommonResources.ABOUT_HTML);
- mOnPageScaleChangedHelper.waitForCallback(pageScaleChangeCallCount);
mOnContentSizeChangedHelper.waitForCallback(contentSizeChangeCallCount);
assertTrue(mOnContentSizeChangedHelper.getHeight() > 0);

Powered by Google App Engine
This is Rietveld 408576698