chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java - Issue 231693002: Remove some dependencies on ContentView.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java

Issue 231693002: Remove some dependencies on ContentView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 8 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java

index ffbc5e661dad6145b6f259ae946b1b75e45ee502..1a5c89fb9f528f2c318c0791787bb194347ffa7d 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java

@@ -22,7 +22,6 @@ import org.chromium.content.browser.ContentViewCore;

import org.chromium.content.browser.test.util.Criteria;

import org.chromium.content.browser.test.util.CriteriaHelper;

import org.chromium.content.browser.test.util.JavaScriptUtils;

-import org.chromium.content.browser.test.util.TestCallbackHelperContainer;

import org.chromium.sync.notifier.SyncStatusHelper;

import org.chromium.sync.signin.AccountManagerHelper;

import org.chromium.sync.signin.ChromeSigninController;

@@ -115,10 +114,8 @@ public class SyncTest extends ChromeShellTestBase {

final ContentViewCore contentViewCore = getContentViewCore(getActivity());

String innerHtml = "";

try {

- final TestCallbackHelperContainer.OnEvaluateJavaScriptResultHelper helper =

- new TestCallbackHelperContainer.OnEvaluateJavaScriptResultHelper();

innerHtml = JavaScriptUtils.executeJavaScriptAndWaitForResult(

- contentViewCore, helper, "document.documentElement.innerHTML");

+ contentViewCore, "document.documentElement.innerHTML");

} catch (InterruptedException e) {

Log.w(TAG, "Interrupted while polling about:sync page for sync status.", e);

} catch (TimeoutException e) {