| Index: components/sync/android/java/src/org/chromium/components/sync/signin/SystemAccountManagerDelegate.java
|
| diff --git a/sync/android/java/src/org/chromium/sync/signin/SystemAccountManagerDelegate.java b/components/sync/android/java/src/org/chromium/components/sync/signin/SystemAccountManagerDelegate.java
|
| similarity index 96%
|
| rename from sync/android/java/src/org/chromium/sync/signin/SystemAccountManagerDelegate.java
|
| rename to components/sync/android/java/src/org/chromium/components/sync/signin/SystemAccountManagerDelegate.java
|
| index bc9630cb7e74c430158c7877d56a4d151da4b019..28a253aa68002fe5d610820d21eeb07ed483c146 100644
|
| --- a/sync/android/java/src/org/chromium/sync/signin/SystemAccountManagerDelegate.java
|
| +++ b/components/sync/android/java/src/org/chromium/components/sync/signin/SystemAccountManagerDelegate.java
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -package org.chromium.sync.signin;
|
| +package org.chromium.components.sync.signin;
|
|
|
| import android.accounts.Account;
|
| import android.accounts.AccountManager;
|
| @@ -35,7 +35,6 @@ import java.util.concurrent.TimeUnit;
|
| */
|
| @MainDex
|
| public class SystemAccountManagerDelegate implements AccountManagerDelegate {
|
| -
|
| private final AccountManager mAccountManager;
|
| private final Context mApplicationContext;
|
| private static final String TAG = "Auth";
|
| @@ -48,7 +47,7 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
|
| @Override
|
| public Account[] getAccountsByType(String type) {
|
| if (!AccountManagerHelper.get(mApplicationContext).hasGetAccountsPermission()) {
|
| - return new Account[]{};
|
| + return new Account[] {};
|
| }
|
| long now = SystemClock.elapsedRealtime();
|
| Account[] accounts = mAccountManager.getAccountsByType(type);
|
| @@ -77,8 +76,8 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
|
| assert !ThreadUtils.runningOnUiThread();
|
| assert AccountManagerHelper.GOOGLE_ACCOUNT_TYPE.equals(account.type);
|
| try {
|
| - return GoogleAuthUtil.getTokenWithNotification(mApplicationContext, account,
|
| - authTokenScope, null);
|
| + return GoogleAuthUtil.getTokenWithNotification(
|
| + mApplicationContext, account, authTokenScope, null);
|
| } catch (GoogleAuthException ex) {
|
| // This case includes a UserRecoverableNotifiedException, but most clients will have
|
| // their own retry mechanism anyway.
|
|
|