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

Side by Side Diff: android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java

Issue 2209303002: binding: Moves the check for the first access to the initial document into BindingSecurity. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed review comments. Created 4 years, 4 months 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 unified diff | Download patch
« no previous file with comments | « no previous file | android_webview/javatests/src/org/chromium/android_webview/test/PopupWindowTest.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.android_webview.test; 5 package org.chromium.android_webview.test;
6 6
7 import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout; 7 import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;
8 8
9 import android.app.Instrumentation; 9 import android.app.Instrumentation;
10 import android.content.Context; 10 import android.content.Context;
(...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 enableJavaScriptOnUiThread(popupContents); 652 enableJavaScriptOnUiThread(popupContents);
653 653
654 getInstrumentation().runOnMainSync(new Runnable() { 654 getInstrumentation().runOnMainSync(new Runnable() {
655 @Override 655 @Override
656 public void run() { 656 public void run() {
657 parentAwContents.supplyContentsForPopup(popupContents); 657 parentAwContents.supplyContentsForPopup(popupContents);
658 } 658 }
659 }); 659 });
660 660
661 OnPageFinishedHelper onPageFinishedHelper = popupContentsClient.getOnPag eFinishedHelper(); 661 OnPageFinishedHelper onPageFinishedHelper = popupContentsClient.getOnPag eFinishedHelper();
662 int callCount = onPageFinishedHelper.getCallCount(); 662 int finishCallCount = onPageFinishedHelper.getCallCount();
663 onPageFinishedHelper.waitForCallback(callCount, 1, WAIT_TIMEOUT_MS, Time Unit.MILLISECONDS); 663 TestAwContentsClient.OnReceivedTitleHelper onReceivedTitleHelper =
664 popupContentsClient.getOnReceivedTitleHelper();
665 int titleCallCount = onReceivedTitleHelper.getCallCount();
666
667 onPageFinishedHelper.waitForCallback(finishCallCount, 1, WAIT_TIMEOUT_MS ,
668 TimeUnit.MILLISECONDS);
669 onReceivedTitleHelper.waitForCallback(titleCallCount, 1, WAIT_TIMEOUT_MS ,
670 TimeUnit.MILLISECONDS);
664 671
665 return new PopupInfo(popupContentsClient, popupContainerView, popupConte nts); 672 return new PopupInfo(popupContentsClient, popupContainerView, popupConte nts);
666 } 673 }
667 } 674 }
OLDNEW
« no previous file with comments | « no previous file | android_webview/javatests/src/org/chromium/android_webview/test/PopupWindowTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698