chrome/android/junit/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java - Issue 2351703003: Refactor: move components/sync/../signin to components/signin/../

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/junit/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java

Issue 2351703003: Refactor: move components/sync/../signin to components/signin/../ (Closed)

Patch Set: rebase Created 4 years, 3 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/test/util/ChromeSigninUtilsTest.java ('k') | chrome/test/android/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/junit/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java

diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java

index 373c000f25426b18a2e5fcde78b28be4c92798e3..b1bf658644b556bc8a9f3689d544b6bab25925bd 100644

--- a/chrome/android/junit/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java

+++ b/chrome/android/junit/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java

@@ -19,11 +19,11 @@ import org.chromium.base.CollectionUtil;

import org.chromium.base.ContextUtils;

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

import org.chromium.chrome.browser.sync.ProfileSyncService;

+import org.chromium.components.signin.ChromeSigninController;

import org.chromium.components.sync.AndroidSyncSettings;

import org.chromium.components.sync.ModelType;

import org.chromium.components.sync.ModelTypeHelper;

import org.chromium.components.sync.notifier.InvalidationIntentProtocol;

-import org.chromium.components.sync.signin.ChromeSigninController;

import org.chromium.components.sync.test.util.MockSyncContentResolverDelegate;

import org.chromium.testing.local.CustomShadowAsyncTask;

import org.chromium.testing.local.LocalRobolectricTestRunner;

@@ -134,6 +134,8 @@ public class InvalidationControllerTest {

AndroidSyncSettings.overrideForTests(mContext, delegate);

ChromeSigninController.get(mContext).setSignedInAccountName("test@example.com");

+ AndroidSyncSettings.updateAccount(

+ mContext, ChromeSigninController.get(mContext).getSignedInUser());

AndroidSyncSettings.enableChromeSync(mContext);

}