OLD | NEW |
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.sync; | 5 package org.chromium.chrome.browser.sync; |
6 | 6 |
7 import android.accounts.Account; | 7 import android.accounts.Account; |
8 import android.content.Context; | 8 import android.content.Context; |
9 | 9 |
10 import org.chromium.base.ThreadUtils; | 10 import org.chromium.base.ThreadUtils; |
11 import org.chromium.chrome.browser.ChromeActivity; | 11 import org.chromium.chrome.browser.ChromeActivity; |
12 import org.chromium.chrome.browser.identity.UniqueIdentificationGenerator; | 12 import org.chromium.chrome.browser.identity.UniqueIdentificationGenerator; |
13 import org.chromium.chrome.browser.identity.UniqueIdentificationGeneratorFactory
; | 13 import org.chromium.chrome.browser.identity.UniqueIdentificationGeneratorFactory
; |
14 import org.chromium.chrome.browser.identity.UuidBasedUniqueIdentificationGenerat
or; | 14 import org.chromium.chrome.browser.identity.UuidBasedUniqueIdentificationGenerat
or; |
15 import org.chromium.chrome.browser.signin.SigninManager; | 15 import org.chromium.chrome.browser.signin.SigninManager; |
16 import org.chromium.chrome.test.ChromeActivityTestCaseBase; | 16 import org.chromium.chrome.test.ChromeActivityTestCaseBase; |
17 import org.chromium.chrome.test.util.browser.signin.SigninTestUtil; | 17 import org.chromium.chrome.test.util.browser.signin.SigninTestUtil; |
18 import org.chromium.chrome.test.util.browser.sync.SyncTestUtil; | 18 import org.chromium.chrome.test.util.browser.sync.SyncTestUtil; |
| 19 import org.chromium.components.sync.AndroidSyncSettings; |
| 20 import org.chromium.components.sync.ModelType; |
| 21 import org.chromium.components.sync.test.util.MockSyncContentResolverDelegate; |
19 import org.chromium.content.browser.test.util.Criteria; | 22 import org.chromium.content.browser.test.util.Criteria; |
20 import org.chromium.content.browser.test.util.CriteriaHelper; | 23 import org.chromium.content.browser.test.util.CriteriaHelper; |
21 import org.chromium.sync.AndroidSyncSettings; | |
22 import org.chromium.sync.ModelType; | |
23 import org.chromium.sync.test.util.MockSyncContentResolverDelegate; | |
24 | 24 |
25 import java.util.Arrays; | 25 import java.util.Arrays; |
26 import java.util.HashSet; | 26 import java.util.HashSet; |
27 import java.util.List; | 27 import java.util.List; |
28 import java.util.Set; | 28 import java.util.Set; |
29 import java.util.concurrent.Semaphore; | 29 import java.util.concurrent.Semaphore; |
30 import java.util.concurrent.TimeUnit; | 30 import java.util.concurrent.TimeUnit; |
31 | 31 |
32 /** | 32 /** |
33 * Base class for common functionality between sync tests. | 33 * Base class for common functionality between sync tests. |
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
225 mProfileSyncService.setPreferredDataTypes(false, preferredTypes)
; | 225 mProfileSyncService.setPreferredDataTypes(false, preferredTypes)
; |
226 } | 226 } |
227 }); | 227 }); |
228 } | 228 } |
229 | 229 |
230 protected void pollInstrumentationThread(Criteria criteria) throws Interrupt
edException { | 230 protected void pollInstrumentationThread(Criteria criteria) throws Interrupt
edException { |
231 CriteriaHelper.pollInstrumentationThread( | 231 CriteriaHelper.pollInstrumentationThread( |
232 criteria, SyncTestUtil.TIMEOUT_MS, SyncTestUtil.INTERVAL_MS); | 232 criteria, SyncTestUtil.TIMEOUT_MS, SyncTestUtil.INTERVAL_MS); |
233 } | 233 } |
234 } | 234 } |
OLD | NEW |