OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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.test.util.browser.sync; | 5 package org.chromium.chrome.test.util.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 import android.util.Log; | 9 import android.util.Log; |
10 import android.util.Pair; | 10 import android.util.Pair; |
11 | 11 |
12 import junit.framework.Assert; | 12 import junit.framework.Assert; |
13 | 13 |
| 14 import org.chromium.base.CommandLine; |
14 import org.chromium.base.ThreadUtils; | 15 import org.chromium.base.ThreadUtils; |
15 import org.chromium.base.test.util.AdvancedMockContext; | 16 import org.chromium.base.test.util.AdvancedMockContext; |
16 import org.chromium.chrome.browser.sync.ProfileSyncService; | 17 import org.chromium.chrome.browser.sync.ProfileSyncService; |
17 import org.chromium.chrome.test.util.TestHttpServerClient; | 18 import org.chromium.chrome.test.util.TestHttpServerClient; |
18 import org.chromium.content.browser.test.util.Criteria; | 19 import org.chromium.content.browser.test.util.Criteria; |
19 import org.chromium.content.browser.test.util.CriteriaHelper; | 20 import org.chromium.content.browser.test.util.CriteriaHelper; |
20 import org.chromium.content.common.CommandLine; | |
21 import org.chromium.sync.signin.AccountManagerHelper; | 21 import org.chromium.sync.signin.AccountManagerHelper; |
22 import org.chromium.sync.signin.ChromeSigninController; | 22 import org.chromium.sync.signin.ChromeSigninController; |
23 import org.chromium.sync.test.util.AccountHolder; | 23 import org.chromium.sync.test.util.AccountHolder; |
24 import org.chromium.sync.test.util.MockAccountManager; | 24 import org.chromium.sync.test.util.MockAccountManager; |
25 import org.json.JSONArray; | 25 import org.json.JSONArray; |
26 import org.json.JSONException; | 26 import org.json.JSONException; |
27 import org.json.JSONObject; | 27 import org.json.JSONObject; |
28 | 28 |
29 import java.util.HashMap; | 29 import java.util.HashMap; |
30 import java.util.Map; | 30 import java.util.Map; |
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
364 @Override | 364 @Override |
365 public Object getSystemService(String name) { | 365 public Object getSystemService(String name) { |
366 if (Context.ACCOUNT_SERVICE.equals(name)) { | 366 if (Context.ACCOUNT_SERVICE.equals(name)) { |
367 throw new UnsupportedOperationException( | 367 throw new UnsupportedOperationException( |
368 "Sync tests should not use system Account Manager."); | 368 "Sync tests should not use system Account Manager."); |
369 } | 369 } |
370 return super.getSystemService(name); | 370 return super.getSystemService(name); |
371 } | 371 } |
372 } | 372 } |
373 } | 373 } |
OLD | NEW |