chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java - Issue 1282603005: Convert ChromeSyncShell to use ChromePublic infrastructure

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/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java

Issue 1282603005: Convert ChromeSyncShell to use ChromePublic infrastructure (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: re-land version Created 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.java ('k') | chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index fcf500f515e5fc3da2a0abda85d1ffe55cd13d13..1b1c64cb0910747b7891a4353a89a8c47cb5b920 100644

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

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

@@ -12,7 +12,7 @@ import android.util.Log;

import org.chromium.base.ActivityState;

import org.chromium.base.ApplicationStatus;

import org.chromium.base.test.util.Feature;

-import org.chromium.chrome.shell.ChromeShellActivity;

+import org.chromium.chrome.browser.ChromeActivity;

import org.chromium.chrome.test.util.browser.sync.SyncTestUtil;

import org.chromium.content.browser.ContentViewCore;

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

@@ -80,7 +80,7 @@ public class SyncTest extends SyncTestBase {

public void testAboutSyncPageDisplaysCurrentSyncStatus() throws InterruptedException {

setupTestAccountAndSignInToSync(CLIENT_ID);

- loadUrlWithSanitization("chrome://sync");

+ loadUrl("chrome://sync");

SyncTestUtil.AboutSyncInfoGetter aboutInfoGetter =

new SyncTestUtil.AboutSyncInfoGetter(getActivity());

try {

@@ -169,7 +169,7 @@ public class SyncTest extends SyncTestBase {

SyncTestUtil.verifySyncIsActiveForAccount(mContext, account);

}

- private static ContentViewCore getContentViewCore(ChromeShellActivity activity) {

- return activity.getActiveContentViewCore();

+ private static ContentViewCore getContentViewCore(ChromeActivity activity) {

+ return activity.getActivityTab().getContentViewCore();

}