Refactor: move components/sync/../signin to components/signin/../

This CL also moves AndroidSyncSettings.updateAccount from ChromeSigninController to SigninManager

BUG=567975

Review-Url: https://codereview.chromium.org/2351703003
Cr-Commit-Position: refs/heads/master@{#421078}

blimp/client/BUILD.gn

@@ -290,6 +290,7 @@ if (is_android) {
       "//blimp/client/core/contents:contents_java",
       "//blimp/client/core/settings:settings_java",
       "//blimp/client/public:public_headers_java",
+      "//components/signin/core/browser/android:java",
       "//components/sync/android:sync_java",
       "//third_party/android_tools:android_support_v7_appcompat_java",
       "//ui/android:ui_java",

blimp/client/DEPS

@@ -6,7 +6,7 @@ include_rules = [
   "+components/safe_json",
   "+components/url_formatter",
   "+components/version_info",
-  "+components/sync/android",
+  "+components/signin/core/browser/android",
   "-content",
   "+device/geolocation",
   "+google_apis/gaia",

blimp/client/app/android/javatests/src/org/chromium/blimp/core/settings/BlimpPreferencesTest.java

@@ -17,7 +17,7 @@
 import org.chromium.base.test.BaseActivityInstrumentationTestCase;
 import org.chromium.blimp.core.MockBlimpClientContext;
 import org.chromium.blimp.core.MockBlimpClientContextDelegate;
-import org.chromium.components.sync.signin.ChromeSigninController;
+import org.chromium.components.signin.ChromeSigninController;
 
 /**
  * Test blimp setting page.

blimp/client/core/android/java/src/org/chromium/blimp/core/settings/AboutBlimpPreferences.java

@@ -21,7 +21,7 @@
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.blimp.R;
-import org.chromium.components.sync.signin.ChromeSigninController;
+import org.chromium.components.signin.ChromeSigninController;
 
 /**
  * Blimp preferences page in embedder.

blimp/client/core/settings/BUILD.gn

@@ -55,6 +55,7 @@ if (is_android) {
       "//blimp/client:blimp_java_resources",
       "//blimp/client/core:common_java",
       "//blimp/client/public:public_headers_java",
+      "//components/signin/core/browser/android:java",
       "//components/sync/android:sync_java",
       "//third_party/android_tools:android_support_v7_appcompat_java",
     ]

build/get_landmines.py

@@ -34,6 +34,7 @@ def print_landmines():
   if platform() == 'android':
     print 'Clobber: to handle new way of suppressing findbugs failures.'
     print 'Clobber to fix gyp not rename package name (crbug.com/457038)'
+    print 'Clobber to recalculate reversed dependency (crbug.com/639042)'
   if platform() == 'win':
     print 'Compile on cc_unittests fails due to symbols removed in r185063.'
   if platform() == 'linux':

chrome/android/BUILD.gn

@@ -364,6 +364,8 @@ junit_binary("chrome_junit_tests") {
     "//chrome/android/webapk/libs/common:common_java",
     "//components/bookmarks/common/android:bookmarks_java",
     "//components/invalidation/impl:java",
+    "//components/signin/core/browser/android:java",
+    "//components/signin/core/browser/android:signin_java_test_support",
     "//components/sync:sync_java_test_support",
     "//components/sync/android:sync_java",
     "//components/url_formatter/android:url_formatter_java",
@@ -433,6 +435,9 @@ android_library("chrome_test_java") {
     "//components/policy/android:policy_java",
     "//components/precache/android:precache_java",
     "//components/precache/android:precache_javatests",
+    "//components/signin/core/browser/android:java",
+    "//components/signin/core/browser/android:javatests",
+    "//components/signin/core/browser/android:signin_java_test_support",
     "//components/sync:sync_java_test_support",
     "//components/sync/android:sync_java",
     "//components/sync/android:sync_javatests",
@@ -757,6 +762,7 @@ android_library("chrome_sync_shell_test_apk_java") {
     "//chrome/test/android:chrome_java_test_support",
     "//components/bookmarks/common/android:bookmarks_java",
     "//components/policy/android:policy_java",
+    "//components/signin/core/browser/android:signin_java_test_support",
     "//components/sync:sync_java_test_support",
     "//components/sync:test_support_sync_proto_java",
     "//components/sync/android:sync_java",

chrome/android/DEPS

@@ -1,6 +1,7 @@
 include_rules = [
   "+components/invalidation",
   "+components/policy",
+  "+components/signin/core/browser/android",
   "+components/spellcheck/browser",
   "+jni",
   "+media/base/android/java",

chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java

@@ -65,8 +65,8 @@
 import org.chromium.chrome.browser.tabmodel.document.DocumentTabModelSelector;
 import org.chromium.chrome.browser.tabmodel.document.StorageDelegate;
 import org.chromium.chrome.browser.tabmodel.document.TabDelegate;
-import org.chromium.components.sync.signin.AccountManagerDelegate;
-import org.chromium.components.sync.signin.SystemAccountManagerDelegate;
+import org.chromium.components.signin.AccountManagerDelegate;
+import org.chromium.components.signin.SystemAccountManagerDelegate;
 import org.chromium.content.app.ContentApplication;
 import org.chromium.content.browser.ChildProcessCreationParams;
 import org.chromium.policy.AppRestrictionsProvider;

chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupAgent.java

@@ -25,7 +25,7 @@
 import org.chromium.chrome.browser.firstrun.FirstRunStatus;
 import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
 import org.chromium.chrome.browser.preferences.privacy.PrivacyPreferencesManager;
-import org.chromium.components.sync.signin.ChromeSigninController;
+import org.chromium.components.signin.ChromeSigninController;
 import org.json.JSONException;
 import org.json.JSONObject;
 

chrome/android/java/src/org/chromium/chrome/browser/IntentHelper.java

@@ -14,7 +14,7 @@
 
 import org.chromium.base.ContentUriUtils;
 import org.chromium.base.annotations.CalledByNative;
-import org.chromium.components.sync.signin.AccountManagerHelper;
+import org.chromium.components.signin.AccountManagerHelper;
 
 import java.io.File;
 

chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountService.java

@@ -9,7 +9,7 @@
 
 import org.chromium.base.Callback;
 import org.chromium.base.ThreadUtils;
-import org.chromium.components.sync.signin.AccountManagerHelper;
+import org.chromium.components.signin.AccountManagerHelper;
 
 /**
  * This class serves as a simple interface for querying the child account information.

chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java

@@ -23,8 +23,8 @@
 import org.chromium.chrome.browser.services.AndroidEduAndChildAccountHelper;
 import org.chromium.chrome.browser.signin.SigninManager;
 import org.chromium.chrome.browser.util.FeatureUtilities;
-import org.chromium.components.sync.signin.AccountManagerHelper;
-import org.chromium.components.sync.signin.ChromeSigninController;
+import org.chromium.components.signin.AccountManagerHelper;
+import org.chromium.components.signin.ChromeSigninController;
 
 /**
  * A helper to determine what should be the sequence of First Run Experience screens.

chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunGlueImpl.java

@@ -11,7 +11,7 @@
 import org.chromium.chrome.browser.metrics.UmaSessionStats;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.signin.AccountAdder;
-import org.chromium.components.sync.signin.AccountManagerHelper;
+import org.chromium.components.signin.AccountManagerHelper;
 
 import java.util.List;
 

chrome/android/java/src/org/chromium/chrome/browser/firstrun/ForcedSigninProcessor.java

@@ -13,8 +13,8 @@
 import org.chromium.chrome.browser.signin.AccountManagementFragment;
 import org.chromium.chrome.browser.signin.SigninManager;
 import org.chromium.chrome.browser.util.FeatureUtilities;
-import org.chromium.components.sync.signin.AccountManagerHelper;
-import org.chromium.components.sync.signin.ChromeSigninController;
+import org.chromium.components.signin.AccountManagerHelper;
+import org.chromium.components.signin.ChromeSigninController;
 
 /**
  * A helper to perform all necessary steps for forced sign in.

chrome/android/java/src/org/chromium/chrome/browser/firstrun/ProfileDataCache.java

@@ -20,7 +20,7 @@
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.profiles.ProfileDownloader;
 import org.chromium.chrome.browser.profiles.ProfileDownloader.Observer;
-import org.chromium.components.sync.signin.AccountManagerHelper;
+import org.chromium.components.signin.AccountManagerHelper;
 import org.chromium.ui.gfx.DeviceDisplayInfo;
 
 import java.util.HashMap;

chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAckedReceiver.java

@@ -12,7 +12,7 @@
 import android.os.Bundle;
 
 import org.chromium.base.ContextUtils;
-import org.chromium.components.sync.signin.AccountManagerHelper;
+import org.chromium.components.signin.AccountManagerHelper;
 
 import java.util.HashSet;
 import java.util.List;

chrome/android/java/src/org/chromium/chrome/browser/gsa/GSAState.java

@@ -12,7 +12,7 @@
 import android.text.TextUtils;
 
 import org.chromium.base.PackageUtils;
-import org.chromium.components.sync.signin.ChromeSigninController;
+import org.chromium.components.signin.ChromeSigninController;
 
 import java.util.List;
 

chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java

@@ -33,7 +33,7 @@
 import org.chromium.chrome.browser.services.AccountsChangedReceiver;
 import org.chromium.chrome.browser.services.GoogleServicesManager;
 import org.chromium.chrome.browser.sync.SyncController;
-import org.chromium.components.sync.signin.AccountManagerHelper;
+import org.chromium.components.signin.AccountManagerHelper;
 import org.chromium.content.common.ContentSwitches;
 import org.chromium.ui.UiUtils;
 

chrome/android/java/src/org/chromium/chrome/browser/invalidation/ChromeBrowserSyncAdapter.java

@@ -23,7 +23,7 @@
 import org.chromium.chrome.browser.init.EmptyBrowserParts;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.components.invalidation.PendingInvalidation;
-import org.chromium.components.sync.signin.ChromeSigninController;
+import org.chromium.components.signin.ChromeSigninController;
 
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;

chrome/android/java/src/org/chromium/chrome/browser/invalidation/DelayedInvalidationsController.java

@@ -16,8 +16,8 @@
 import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.components.invalidation.PendingInvalidation;
+import org.chromium.components.signin.AccountManagerHelper;
 import org.chromium.components.sync.AndroidSyncSettings;
-import org.chromium.components.sync.signin.AccountManagerHelper;
 
 import java.util.ArrayList;
 import java.util.Arrays;

chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java

@@ -18,10 +18,10 @@
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
 import org.chromium.components.invalidation.InvalidationClientService;
+import org.chromium.components.signin.ChromeSigninController;
 import org.chromium.components.sync.AndroidSyncSettings;
 import org.chromium.components.sync.ModelType;
 import org.chromium.components.sync.notifier.InvalidationIntentProtocol;
-import org.chromium.components.sync.signin.ChromeSigninController;
 
 import java.util.HashSet;
 

chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java

@@ -24,9 +24,9 @@
 import org.chromium.chrome.browser.signin.SigninManager;
 import org.chromium.chrome.browser.signin.SigninManager.SignInStateObserver;
 import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.components.signin.ChromeSigninController;
 import org.chromium.components.sync.AndroidSyncSettings;
 import org.chromium.components.sync.AndroidSyncSettings.AndroidSyncSettingsObserver;
-import org.chromium.components.sync.signin.ChromeSigninController;
 import org.chromium.content_public.browser.LoadUrlParams;
 
 import java.util.Collections;

chrome/android/java/src/org/chromium/chrome/browser/preferences/SignInPreference.java

@@ -26,8 +26,8 @@
 import org.chromium.chrome.browser.signin.SigninManager.SignInAllowedObserver;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
 import org.chromium.chrome.browser.sync.ProfileSyncService.SyncStateChangedListener;
+import org.chromium.components.signin.ChromeSigninController;
 import org.chromium.components.sync.AndroidSyncSettings;
-import org.chromium.components.sync.signin.ChromeSigninController;
 
 /**
  * A preference that displays "Sign in to Chrome" when the user is not sign in, and displays

chrome/android/java/src/org/chromium/chrome/browser/preferences/SyncPreference.java

@@ -17,9 +17,9 @@
 import org.chromium.chrome.browser.childaccounts.ChildAccountService;
 import org.chromium.chrome.browser.sync.GoogleServiceAuthError;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
+import org.chromium.components.signin.ChromeSigninController;
 import org.chromium.components.sync.AndroidSyncSettings;
 import org.chromium.components.sync.ProtocolErrorClientAction;
-import org.chromium.components.sync.signin.ChromeSigninController;
 
 /**
  * A preference that displays the current sync account and status (enabled, error, needs passphrase,

chrome/android/java/src/org/chromium/chrome/browser/preferences/SyncedAccountPreference.java

@@ -11,9 +11,9 @@
 import android.util.AttributeSet;
 
 import org.chromium.chrome.R;
+import org.chromium.components.signin.AccountManagerHelper;
+import org.chromium.components.signin.ChromeSigninController;
 import org.chromium.components.sync.AndroidSyncSettings;
-import org.chromium.components.sync.signin.AccountManagerHelper;
-import org.chromium.components.sync.signin.ChromeSigninController;
 
 /**
  * A preference that displays the account currently being synced and allows the user to choose a new

chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferences.java

@@ -31,7 +31,7 @@
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.browser.tabmodel.document.TabDelegate;
-import org.chromium.components.sync.signin.ChromeSigninController;
+import org.chromium.components.signin.ChromeSigninController;
 
 import java.util.Arrays;
 import java.util.EnumSet;

chrome/android/java/src/org/chromium/chrome/browser/services/GoogleServicesManager.java

@@ -16,7 +16,7 @@
 import org.chromium.chrome.browser.signin.SigninHelper;
 import org.chromium.chrome.browser.signin.SigninManager;
 import org.chromium.chrome.browser.sync.SyncController;
-import org.chromium.components.sync.signin.ChromeSigninController;
+import org.chromium.components.signin.ChromeSigninController;
 
 /**
  * Starts and monitors various sync and Google services related tasks.

chrome/android/java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java

@@ -15,9 +15,9 @@
 import com.google.ipc.invalidation.ticl.android2.channel.GcmUpstreamSenderService;
 
 import org.chromium.chrome.browser.signin.OAuth2TokenService;
+import org.chromium.components.signin.AccountManagerHelper;
+import org.chromium.components.signin.ChromeSigninController;
 import org.chromium.components.sync.SyncConstants;
-import org.chromium.components.sync.signin.AccountManagerHelper;
-import org.chromium.components.sync.signin.ChromeSigninController;
 
 import java.io.IOException;
 import java.util.UUID;

chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java

@@ -51,8 +51,8 @@
 import org.chromium.chrome.browser.sync.ProfileSyncService;
 import org.chromium.chrome.browser.sync.ProfileSyncService.SyncStateChangedListener;
 import org.chromium.chrome.browser.sync.ui.SyncCustomizationFragment;
-import org.chromium.components.sync.signin.AccountManagerHelper;
-import org.chromium.components.sync.signin.ChromeSigninController;
+import org.chromium.components.signin.AccountManagerHelper;
+import org.chromium.components.signin.ChromeSigninController;
 
 import java.util.ArrayList;
 import java.util.HashMap;

chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninView.java

@@ -27,7 +27,7 @@
 import org.chromium.chrome.browser.profiles.ProfileDownloader;
 import org.chromium.chrome.browser.signin.AccountTrackerService.OnSystemAccountsSeededListener;
 import org.chromium.chrome.browser.signin.ConfirmImportSyncDataDialog.ImportSyncType;
-import org.chromium.components.sync.signin.AccountManagerHelper;
+import org.chromium.components.signin.AccountManagerHelper;
 import org.chromium.ui.text.NoUnderlineClickableSpan;
 import org.chromium.ui.text.SpanApplier;
 import org.chromium.ui.text.SpanApplier.SpanInfo;

chrome/android/java/src/org/chromium/chrome/browser/signin/AccountTrackerService.java

@@ -14,7 +14,7 @@
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.JNINamespace;
-import org.chromium.components.sync.signin.AccountManagerHelper;
+import org.chromium.components.signin.AccountManagerHelper;
 
 /**
 * Android wrapper of AccountTrackerService which provides access from the java layer.

chrome/android/java/src/org/chromium/chrome/browser/signin/OAuth2TokenService.java

@@ -15,8 +15,8 @@
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.components.sync.signin.AccountManagerHelper;
-import org.chromium.components.sync.signin.ChromeSigninController;
+import org.chromium.components.signin.AccountManagerHelper;
+import org.chromium.components.signin.ChromeSigninController;
 
 import java.util.Arrays;
 import java.util.HashSet;

chrome/android/java/src/org/chromium/chrome/browser/signin/SigninAndSyncView.java

@@ -20,9 +20,9 @@
 import org.chromium.chrome.browser.signin.AccountSigninActivity.AccessPoint;
 import org.chromium.chrome.browser.signin.SigninManager.SignInStateObserver;
 import org.chromium.chrome.browser.sync.ui.SyncCustomizationFragment;
+import org.chromium.components.signin.ChromeSigninController;
 import org.chromium.components.sync.AndroidSyncSettings;
 import org.chromium.components.sync.AndroidSyncSettings.AndroidSyncSettingsObserver;
-import org.chromium.components.sync.signin.ChromeSigninController;
 
 /**
  * A View that shows the user the next step they must complete to start syncing their data (eg.

chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java

@@ -22,9 +22,9 @@
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.signin.SigninManager.SignInCallback;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
+import org.chromium.components.signin.AccountManagerHelper;
+import org.chromium.components.signin.ChromeSigninController;
 import org.chromium.components.sync.AndroidSyncSettings;
-import org.chromium.components.sync.signin.AccountManagerHelper;
-import org.chromium.components.sync.signin.ChromeSigninController;
 
 import java.io.IOException;
 import java.util.ArrayList;

chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java

@@ -22,8 +22,9 @@
 import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
 import org.chromium.chrome.browser.externalauth.UserRecoverableErrorHandler;
 import org.chromium.chrome.browser.sync.SyncUserDataWiper;
-import org.chromium.components.sync.signin.AccountManagerHelper;
-import org.chromium.components.sync.signin.ChromeSigninController;
+import org.chromium.components.signin.AccountManagerHelper;
+import org.chromium.components.signin.ChromeSigninController;
+import org.chromium.components.sync.AndroidSyncSettings;
 
 import javax.annotation.Nullable;
 
@@ -434,6 +435,7 @@ private void finishSignIn() {
         // Cache the signed-in account name. This must be done after the native call, otherwise
         // sync tries to start without being signed in natively and crashes.
         ChromeSigninController.get(mContext).setSignedInAccountName(mSignInState.account.name);
+        AndroidSyncSettings.updateAccount(mContext, mSignInState.account);
 
         if (mSignInState.callback != null) {
             mSignInState.callback.onSignInComplete();
@@ -513,6 +515,7 @@ public void signOut(Runnable callback, WipeDataHooks wipeDataHooks) {
         // http://crbug.com/589028
         nativeSignOut(mNativeSigninManagerAndroid);
         ChromeSigninController.get(mContext).setSignedInAccountName(null);
+        AndroidSyncSettings.updateAccount(mContext, null);
 
         if (wipeData) {
             wipeProfileData(wipeDataHooks);

chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoUtil.java

@@ -11,7 +11,7 @@
 import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
-import org.chromium.components.sync.signin.ChromeSigninController;
+import org.chromium.components.signin.ChromeSigninController;
 import org.chromium.ui.base.WindowAndroid;
 
 /**