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

Side by Side Diff: chrome/android/junit/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java

Issue 2130453004: [Sync] Move //sync to //components/sync. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. 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 | « chrome/android/junit/DEPS ('k') | chrome/android/sync_shell/DEPS » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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.chrome.browser.invalidation; 5 package org.chromium.chrome.browser.invalidation;
6 6
7 import android.accounts.Account; 7 import android.accounts.Account;
8 import android.app.Activity; 8 import android.app.Activity;
9 import android.content.Context; 9 import android.content.Context;
10 import android.content.Intent; 10 import android.content.Intent;
11 11
12 import org.chromium.base.ActivityState; 12 import org.chromium.base.ActivityState;
13 import org.chromium.base.ApplicationState; 13 import org.chromium.base.ApplicationState;
14 import org.chromium.base.ApplicationStatus; 14 import org.chromium.base.ApplicationStatus;
15 import org.chromium.base.CollectionUtil; 15 import org.chromium.base.CollectionUtil;
16 import org.chromium.base.ContextUtils; 16 import org.chromium.base.ContextUtils;
17 import org.chromium.base.test.util.Feature; 17 import org.chromium.base.test.util.Feature;
18 import org.chromium.chrome.browser.sync.ProfileSyncService; 18 import org.chromium.chrome.browser.sync.ProfileSyncService;
19 import org.chromium.components.invalidation.InvalidationClientService; 19 import org.chromium.components.invalidation.InvalidationClientService;
20 import org.chromium.sync.AndroidSyncSettings; 20 import org.chromium.components.sync.AndroidSyncSettings;
21 import org.chromium.sync.ModelType; 21 import org.chromium.components.sync.ModelType;
22 import org.chromium.sync.ModelTypeHelper; 22 import org.chromium.components.sync.ModelTypeHelper;
23 import org.chromium.sync.notifier.InvalidationIntentProtocol; 23 import org.chromium.components.sync.notifier.InvalidationIntentProtocol;
24 import org.chromium.sync.signin.ChromeSigninController; 24 import org.chromium.components.sync.signin.ChromeSigninController;
25 import org.chromium.sync.test.util.MockSyncContentResolverDelegate; 25 import org.chromium.components.sync.test.util.MockSyncContentResolverDelegate;
26 import org.chromium.testing.local.CustomShadowAsyncTask; 26 import org.chromium.testing.local.CustomShadowAsyncTask;
27 import org.chromium.testing.local.LocalRobolectricTestRunner; 27 import org.chromium.testing.local.LocalRobolectricTestRunner;
28 import org.junit.Assert; 28 import org.junit.Assert;
29 import org.junit.Before; 29 import org.junit.Before;
30 import org.junit.Test; 30 import org.junit.Test;
31 import org.junit.runner.RunWith; 31 import org.junit.runner.RunWith;
32 import org.robolectric.Robolectric; 32 import org.robolectric.Robolectric;
33 import org.robolectric.annotation.Config; 33 import org.robolectric.annotation.Config;
34 import org.robolectric.shadows.ShadowActivity; 34 import org.robolectric.shadows.ShadowActivity;
35 35
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 * intent. 475 * intent.
476 */ 476 */
477 private static Set<String> getRegisterIntentRegisterTypes(Intent intent) { 477 private static Set<String> getRegisterIntentRegisterTypes(Intent intent) {
478 Set<String> registeredTypes = new HashSet<String>(); 478 Set<String> registeredTypes = new HashSet<String>();
479 registeredTypes.addAll( 479 registeredTypes.addAll(
480 intent.getStringArrayListExtra(InvalidationIntentProtocol.EXTRA_ REGISTERED_TYPES)); 480 intent.getStringArrayListExtra(InvalidationIntentProtocol.EXTRA_ REGISTERED_TYPES));
481 return registeredTypes; 481 return registeredTypes;
482 } 482 }
483 483
484 } 484 }
OLDNEW
« no previous file with comments | « chrome/android/junit/DEPS ('k') | chrome/android/sync_shell/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698