Merge java_staging/src into java/src.

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

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/services/GoogleServicesManager.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/services/GoogleServicesManager.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/services/GoogleServicesManager.java
deleted file mode 100644
index 20c37487d2534eb01bcc6a28884eaf6cfa03ee3a..0000000000000000000000000000000000000000
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/services/GoogleServicesManager.java
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser.services;
-
-import android.content.Context;
-import android.util.Log;
-
-import com.google.android.gms.auth.GoogleAuthException;
-import com.google.android.gms.auth.GoogleAuthUtil;
-
-import org.chromium.base.ApplicationState;
-import org.chromium.base.ApplicationStatus;
-import org.chromium.base.ApplicationStatus.ApplicationStateListener;
-import org.chromium.base.ThreadUtils;
-import org.chromium.base.TraceEvent;
-import org.chromium.base.VisibleForTesting;
-import org.chromium.chrome.browser.signin.AccountIdProvider;
-import org.chromium.chrome.browser.signin.SigninHelper;
-import org.chromium.chrome.browser.signin.SigninManager;
-import org.chromium.chrome.browser.sync.SyncController;
-import org.chromium.sync.signin.ChromeSigninController;
-
-import java.io.IOException;
-
-/**
- * Starts and monitors various sync and Google services related tasks.
- * - add listeners to AccountManager.
- * - sets up the Android status bar notification controller.
- * - start Tango service if sync setup is completed.
- * <p/>
- * It is intended to be an application level object and is not tied to any particulary
- * activity, although re-verifies some settings whe browser is launched.
- * <p/>
- * The object must be created on the main thread.
- * <p/>
- */
-public class GoogleServicesManager implements ApplicationStateListener {
-
-    private static final String TAG = "GoogleServicesManager";
-
-    @VisibleForTesting
-    public static final String SESSION_TAG_PREFIX = "session_sync";
-
-    private static GoogleServicesManager sGoogleServicesManager;
-
-    @VisibleForTesting
-    protected final Context mContext;
-
-    private final ChromeSigninController mChromeSigninController;
-
-    private final SigninHelper mSigninHelper;
-
-    /**
-     * A helper method for retrieving the application-wide GoogleServicesManager.
-     * <p/>
-     * Can only be accessed on the main thread.
-     *
-     * @param context the ApplicationContext is retrieved from the context used as an argument.
-     * @return a singleton instance of the GoogleServicesManager
-     */
-    public static GoogleServicesManager get(Context context) {
-        ThreadUtils.assertOnUiThread();
-        if (sGoogleServicesManager == null) {
-            sGoogleServicesManager = new GoogleServicesManager(context);
-        }
-        return sGoogleServicesManager;
-    }
-
-    private GoogleServicesManager(Context context) {
-        try {
-            TraceEvent.begin("GoogleServicesManager.GoogleServicesManager");
-            ThreadUtils.assertOnUiThread();
-            // We should store the application context, as we outlive any activity which may create
-            // us.
-            mContext = context.getApplicationContext();
-
-            mChromeSigninController = ChromeSigninController.get(mContext);
-            mSigninHelper = SigninHelper.get(mContext);
-
-            // The sign out flow starts by clearing the signed in user in the ChromeSigninController
-            // on the Java side, and then performs a sign out on the native side. If there is a
-            // crash on the native side then the signin state may get out of sync. Make sure that
-            // the native side is signed out if the Java side doesn't have a currently signed in
-            // user.
-            SigninManager signinManager = SigninManager.get(mContext);
-            if (!mChromeSigninController.isSignedIn() && signinManager.isSignedInOnNative()) {
-                Log.w(TAG, "Signed in state got out of sync, forcing native sign out");
-                signinManager.signOut(null, null);
-            }
-
-            // Register account Id provider.
-            AccountIdProvider.setInstance(new AccountIdProvider() {
-                @Override
-                public String getAccountId(Context ctx, String accountName) {
-                    try {
-                        return GoogleAuthUtil.getAccountId(ctx, accountName);
-                    } catch (IOException | GoogleAuthException ex) {
-                        Log.e(TAG, "AccountIdProvider.getAccountId", ex);
-                        return null;
-                    }
-                }
-            });
-
-            // Initialize sync.
-            SyncController.get(context);
-
-            ApplicationStatus.registerApplicationStateListener(this);
-        } finally {
-            TraceEvent.end("GoogleServicesManager.GoogleServicesManager");
-        }
-    }
-
-    /**
-     * Called once during initialization and then again for every start (warm-start).
-     * Responsible for checking if configuration has changed since Chrome was last launched
-     * and updates state accordingly.
-     */
-    public void onMainActivityStart() {
-        try {
-            TraceEvent.begin("GoogleServicesManager.onMainActivityStart");
-            boolean accountsChanged = mSigninHelper.checkAndClearAccountsChangedPref(mContext);
-            mSigninHelper.validateAccountSettings(accountsChanged);
-        } finally {
-            TraceEvent.end("GoogleServicesManager.onMainActivityStart");
-        }
-    }
-
-    @Override
-    public void onApplicationStateChange(int newState) {
-        if (newState == ApplicationState.HAS_RUNNING_ACTIVITIES) {
-            onMainActivityStart();
-        }
-    }
-}