Merge java_staging/src into java/src.

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

Index: chrome/android/java_staging/src/org/chromium/chrome/browser/services/AccountsChangedReceiver.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/services/AccountsChangedReceiver.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/services/AccountsChangedReceiver.java
deleted file mode 100644
index 34fc03382d0c60cb8a6aee0adf2c9491ec347cb8..0000000000000000000000000000000000000000
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/services/AccountsChangedReceiver.java
+++ /dev/null
@@ -1,85 +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.accounts.AccountManager;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.os.AsyncTask;
-import android.util.Log;
-
-import org.chromium.base.ApplicationStatus;
-import org.chromium.base.ThreadUtils;
-import org.chromium.base.annotations.SuppressFBWarnings;
-import org.chromium.base.library_loader.ProcessInitException;
-import org.chromium.chrome.browser.ChromeMobileApplication;
-import org.chromium.chrome.browser.ChromiumApplication;
-import org.chromium.chrome.browser.signin.SigninHelper;
-import org.chromium.content.browser.BrowserStartupController.StartupCallback;
-
-/**
- * This receiver is notified when accounts are added, accounts are removed, or
- * an account's credentials (saved password, etc) are changed.
- */
-public class AccountsChangedReceiver extends BroadcastReceiver {
-    private static final String TAG = "AccountsChangeReceiver";
-
-    @SuppressFBWarnings("DM_EXIT")
-    @Override
-    public void onReceive(final Context context, final Intent intent) {
-        AsyncTask<Void, Void, Void> task = new AsyncTask<Void, Void, Void>() {
-            @Override
-            protected Void doInBackground(Void... params) {
-                SigninHelper.updateAccountRenameData(context);
-                return null;
-            }
-
-            @Override
-            protected void onPostExecute(Void result) {
-                continueHandleAccountChangeIfNeeded(context, intent);
-            }
-        };
-        task.execute();
-    }
-
-    private void continueHandleAccountChangeIfNeeded(final Context context, Intent intent) {
-        if (AccountManager.LOGIN_ACCOUNTS_CHANGED_ACTION.equals(intent.getAction())) {
-            boolean isChromeVisible = ApplicationStatus.hasVisibleActivities();
-            if (isChromeVisible) {
-                StartupCallback startupCallback = new StartupCallback() {
-                    @Override
-                    public void onSuccess(boolean alreadyStarted) {
-                        ThreadUtils.runOnUiThread(new Runnable() {
-                            @Override
-                            public void run() {
-                                SigninHelper.get(context.getApplicationContext())
-                                        .validateAccountSettings(true);
-                            }
-                        });
-                    }
-                    @Override
-                    public void onFailure() {
-                        // Startup failed. So notify SigninHelper of changed accounts via
-                        // shared prefs.
-                        SigninHelper.markAccountsChangedPref(context);
-                    }
-                };
-
-                try {
-                    ((ChromeMobileApplication) context.getApplicationContext())
-                            .startChromeBrowserProcessesAsync(startupCallback);
-                } catch (ProcessInitException e) {
-                    Log.e(TAG, "Unable to load native library.", e);
-                    ChromiumApplication.reportStartupErrorAndExit(e);
-                }
-            } else {
-                // Notify SigninHelper of changed accounts (via shared prefs).
-                SigninHelper.markAccountsChangedPref(context);
-            }
-        }
-
-    }
-}