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.ui; | 5 package org.chromium.chrome.browser.sync.ui; |
6 | 6 |
7 import android.app.Instrumentation.ActivityMonitor; | 7 import android.app.Instrumentation.ActivityMonitor; |
8 import android.content.ComponentName; | 8 import android.content.ComponentName; |
9 import android.content.Context; | 9 import android.content.Context; |
10 import android.content.Intent; | 10 import android.content.Intent; |
11 import android.os.Bundle; | 11 import android.os.Bundle; |
12 import android.test.suitebuilder.annotation.SmallTest; | 12 import android.test.suitebuilder.annotation.SmallTest; |
13 | 13 |
14 import org.chromium.base.ThreadUtils; | 14 import org.chromium.base.ThreadUtils; |
15 import org.chromium.base.test.util.Feature; | 15 import org.chromium.base.test.util.Feature; |
16 import org.chromium.chrome.browser.sync.FakeProfileSyncService; | 16 import org.chromium.chrome.browser.sync.FakeProfileSyncService; |
17 import org.chromium.chrome.browser.sync.ProfileSyncService; | 17 import org.chromium.chrome.browser.sync.ProfileSyncService; |
18 import org.chromium.chrome.test.util.ApplicationData; | 18 import org.chromium.chrome.test.util.ApplicationData; |
19 import org.chromium.chrome.test.util.browser.signin.SigninTestUtil; | 19 import org.chromium.chrome.test.util.browser.signin.SigninTestUtil; |
| 20 import org.chromium.components.sync.signin.ChromeSigninController; |
20 import org.chromium.content.browser.test.NativeLibraryTestBase; | 21 import org.chromium.content.browser.test.NativeLibraryTestBase; |
21 import org.chromium.sync.signin.ChromeSigninController; | |
22 | 22 |
23 /** | 23 /** |
24 * Tests for PassphraseActivity. | 24 * Tests for PassphraseActivity. |
25 */ | 25 */ |
26 public class PassphraseActivityTest extends NativeLibraryTestBase { | 26 public class PassphraseActivityTest extends NativeLibraryTestBase { |
27 private static final String TEST_ACCOUNT = "test@gmail.com"; | 27 private static final String TEST_ACCOUNT = "test@gmail.com"; |
28 | 28 |
29 private Context mContext; | 29 private Context mContext; |
30 | 30 |
31 @Override | 31 @Override |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 private void overrideProfileSyncService() { | 96 private void overrideProfileSyncService() { |
97 ThreadUtils.runOnUiThreadBlocking(new Runnable() { | 97 ThreadUtils.runOnUiThreadBlocking(new Runnable() { |
98 @Override | 98 @Override |
99 public void run() { | 99 public void run() { |
100 // PSS has to be constructed on the UI thread. | 100 // PSS has to be constructed on the UI thread. |
101 ProfileSyncService.overrideForTests(new FakeProfileSyncService()
); | 101 ProfileSyncService.overrideForTests(new FakeProfileSyncService()
); |
102 } | 102 } |
103 }); | 103 }); |
104 } | 104 } |
105 } | 105 } |
OLD | NEW |