OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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.sync; | 5 package org.chromium.chrome.browser.sync; |
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.test.suitebuilder.annotation.LargeTest; | 9 import android.test.suitebuilder.annotation.LargeTest; |
10 | 10 |
11 import org.chromium.base.ActivityState; | 11 import org.chromium.base.ActivityState; |
12 import org.chromium.base.ApplicationStatus; | 12 import org.chromium.base.ApplicationStatus; |
13 import org.chromium.base.ThreadUtils; | 13 import org.chromium.base.ThreadUtils; |
14 import org.chromium.base.test.util.DisabledTest; | 14 import org.chromium.base.test.util.DisabledTest; |
15 import org.chromium.base.test.util.Feature; | 15 import org.chromium.base.test.util.Feature; |
16 import org.chromium.base.test.util.FlakyTest; | 16 import org.chromium.base.test.util.FlakyTest; |
17 import org.chromium.chrome.browser.ChromeActivity; | 17 import org.chromium.chrome.browser.ChromeActivity; |
18 import org.chromium.chrome.browser.signin.AccountIdProvider; | 18 import org.chromium.chrome.browser.signin.AccountIdProvider; |
19 import org.chromium.chrome.browser.signin.AccountTrackerService; | 19 import org.chromium.chrome.browser.signin.AccountTrackerService; |
20 import org.chromium.chrome.browser.signin.SigninHelper; | 20 import org.chromium.chrome.browser.signin.SigninHelper; |
21 import org.chromium.chrome.browser.signin.SigninManager; | 21 import org.chromium.chrome.browser.signin.SigninManager; |
22 import org.chromium.chrome.test.util.browser.signin.MockChangeEventChecker; | 22 import org.chromium.chrome.test.util.browser.signin.MockChangeEventChecker; |
23 import org.chromium.chrome.test.util.browser.signin.SigninTestUtil; | 23 import org.chromium.chrome.test.util.browser.signin.SigninTestUtil; |
24 import org.chromium.chrome.test.util.browser.sync.SyncTestUtil; | 24 import org.chromium.chrome.test.util.browser.sync.SyncTestUtil; |
| 25 import org.chromium.components.sync.AndroidSyncSettings; |
25 import org.chromium.content.browser.ContentViewCore; | 26 import org.chromium.content.browser.ContentViewCore; |
26 import org.chromium.content.browser.test.util.Criteria; | 27 import org.chromium.content.browser.test.util.Criteria; |
27 import org.chromium.content.browser.test.util.CriteriaHelper; | 28 import org.chromium.content.browser.test.util.CriteriaHelper; |
28 import org.chromium.sync.AndroidSyncSettings; | |
29 | 29 |
30 /** | 30 /** |
31 * Test suite for Sync. | 31 * Test suite for Sync. |
32 */ | 32 */ |
33 public class SyncTest extends SyncTestBase { | 33 public class SyncTest extends SyncTestBase { |
34 private static final String TAG = "SyncTest"; | 34 private static final String TAG = "SyncTest"; |
35 | 35 |
36 @LargeTest | 36 @LargeTest |
37 @Feature({"Sync"}) | 37 @Feature({"Sync"}) |
38 public void testFlushDirectoryDoesntBreakSync() throws Throwable { | 38 public void testFlushDirectoryDoesntBreakSync() throws Throwable { |
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
203 | 203 |
204 mSyncContentResolver.setMasterSyncAutomatically(false); | 204 mSyncContentResolver.setMasterSyncAutomatically(false); |
205 startSync(); | 205 startSync(); |
206 assertFalse(SyncTestUtil.isSyncRequested()); | 206 assertFalse(SyncTestUtil.isSyncRequested()); |
207 } | 207 } |
208 | 208 |
209 private static ContentViewCore getContentViewCore(ChromeActivity activity) { | 209 private static ContentViewCore getContentViewCore(ChromeActivity activity) { |
210 return activity.getActivityTab().getContentViewCore(); | 210 return activity.getActivityTab().getContentViewCore(); |
211 } | 211 } |
212 } | 212 } |
OLD | NEW |