chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java - Issue 184993005: Rename ChromiumTestShell classes to ChromeShell.

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 184993005: Rename ChromiumTestShell classes to ChromeShell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase yet again Created 6 years, 10 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/sync/DelayedSyncControllerTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/test/DummyTest.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 04d188e4116446e60966265b1f86e0dc4c7bc714..ffbc5e661dad6145b6f259ae946b1b75e45ee502 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

@@ -13,8 +13,8 @@ import org.chromium.base.test.util.HostDrivenTest;

import org.chromium.chrome.browser.identity.UniqueIdentificationGenerator;

import org.chromium.chrome.browser.identity.UniqueIdentificationGeneratorFactory;

import org.chromium.chrome.browser.identity.UuidBasedUniqueIdentificationGenerator;

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

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

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

+import org.chromium.chrome.shell.ChromeShellTestBase;

import org.chromium.chrome.shell.sync.SyncController;

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

import org.chromium.content.browser.ContentView;

@@ -34,7 +34,7 @@ import java.util.concurrent.TimeoutException;

/**

* Test suite for Sync.

-public class SyncTest extends ChromiumTestShellTestBase {

+public class SyncTest extends ChromeShellTestBase {

private static final String TAG = "SyncTest";

private static final String FOREIGN_SESSION_TEST_MACHINE_ID =

@@ -167,7 +167,7 @@ public class SyncTest extends ChromiumTestShellTestBase {

SyncTestUtil.verifySyncIsSignedOut(getActivity());

- final Activity activity = launchChromiumTestShellWithBlankPage();

+ final Activity activity = launchChromeShellWithBlankPage();

ThreadUtils.runOnUiThreadBlocking(new Runnable() {

@Override

public void run() {

@@ -180,7 +180,7 @@ public class SyncTest extends ChromiumTestShellTestBase {

SyncTestUtil.isSyncEverythingEnabled(mContext));

}

- private static ContentViewCore getContentViewCore(ChromiumTestShellActivity activity) {

+ private static ContentViewCore getContentViewCore(ChromeShellActivity activity) {

ContentView contentView = activity.getActiveContentView();

if (contentView == null) return null;

return contentView.getContentViewCore();