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

Side by Side Diff: chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.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
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.sync; 5 package org.chromium.chrome.browser.sync;
6 6
7 import android.annotation.SuppressLint; 7 import android.annotation.SuppressLint;
8 import android.app.Dialog; 8 import android.app.Dialog;
9 import android.app.FragmentTransaction; 9 import android.app.FragmentTransaction;
10 import android.preference.CheckBoxPreference; 10 import android.preference.CheckBoxPreference;
(...skipping 11 matching lines...) Expand all
22 import org.chromium.chrome.R; 22 import org.chromium.chrome.R;
23 import org.chromium.chrome.browser.autofill.PersonalDataManager; 23 import org.chromium.chrome.browser.autofill.PersonalDataManager;
24 import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard; 24 import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard;
25 import org.chromium.chrome.browser.preferences.Preferences; 25 import org.chromium.chrome.browser.preferences.Preferences;
26 import org.chromium.chrome.browser.sync.ui.PassphraseCreationDialogFragment; 26 import org.chromium.chrome.browser.sync.ui.PassphraseCreationDialogFragment;
27 import org.chromium.chrome.browser.sync.ui.PassphraseDialogFragment; 27 import org.chromium.chrome.browser.sync.ui.PassphraseDialogFragment;
28 import org.chromium.chrome.browser.sync.ui.PassphraseTypeDialogFragment; 28 import org.chromium.chrome.browser.sync.ui.PassphraseTypeDialogFragment;
29 import org.chromium.chrome.browser.sync.ui.SyncCustomizationFragment; 29 import org.chromium.chrome.browser.sync.ui.SyncCustomizationFragment;
30 import org.chromium.chrome.test.util.ActivityUtils; 30 import org.chromium.chrome.test.util.ActivityUtils;
31 import org.chromium.chrome.test.util.browser.sync.SyncTestUtil; 31 import org.chromium.chrome.test.util.browser.sync.SyncTestUtil;
32 import org.chromium.sync.AndroidSyncSettings; 32 import org.chromium.components.sync.AndroidSyncSettings;
33 import org.chromium.sync.ModelType; 33 import org.chromium.components.sync.ModelType;
34 import org.chromium.sync.PassphraseType; 34 import org.chromium.components.sync.PassphraseType;
35 35
36 import java.util.Collection; 36 import java.util.Collection;
37 import java.util.HashMap; 37 import java.util.HashMap;
38 import java.util.HashSet; 38 import java.util.HashSet;
39 import java.util.List; 39 import java.util.List;
40 import java.util.Map; 40 import java.util.Map;
41 import java.util.Set; 41 import java.util.Set;
42 import java.util.concurrent.Callable; 42 import java.util.concurrent.Callable;
43 43
44 /** 44 /**
(...skipping 763 matching lines...) Expand 10 before | Expand all | Expand 10 after
808 private void clearError(final TextView textView) { 808 private void clearError(final TextView textView) {
809 ThreadUtils.runOnUiThreadBlocking(new Runnable() { 809 ThreadUtils.runOnUiThreadBlocking(new Runnable() {
810 @Override 810 @Override
811 public void run() { 811 public void run() {
812 textView.setError(null); 812 textView.setError(null);
813 } 813 }
814 }); 814 });
815 getInstrumentation().waitForIdleSync(); 815 getInstrumentation().waitForIdleSync();
816 } 816 }
817 } 817 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698