Index: components/sync/android/java/src/org/chromium/components/sync/signin/AccountManagerHelper.java |
diff --git a/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java b/components/sync/android/java/src/org/chromium/components/sync/signin/AccountManagerHelper.java |
similarity index 97% |
rename from sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java |
rename to components/sync/android/java/src/org/chromium/components/sync/signin/AccountManagerHelper.java |
index 55431209ba4f54a53a17b7da4762667fedc49885..76a725c265d7c897fb822a691a62fa7f67a1b5d9 100644 |
--- a/sync/android/java/src/org/chromium/sync/signin/AccountManagerHelper.java |
+++ b/components/sync/android/java/src/org/chromium/components/sync/signin/AccountManagerHelper.java |
@@ -2,8 +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.Manifest; |
import android.accounts.Account; |
@@ -45,7 +44,8 @@ public class AccountManagerHelper { |
* An account feature (corresponding to a Gaia service flag) that specifies whether the account |
* is a child account. |
*/ |
- @VisibleForTesting public static final String FEATURE_IS_CHILD_ACCOUNT_KEY = "service_uca"; |
+ @VisibleForTesting |
+ public static final String FEATURE_IS_CHILD_ACCOUNT_KEY = "service_uca"; |
private static final Object sLock = new Object(); |
@@ -315,8 +315,9 @@ public class AccountManagerHelper { |
} |
public boolean hasGetAccountsPermission() { |
- return mApplicationContext.checkPermission(Manifest.permission.GET_ACCOUNTS, |
- Process.myPid(), Process.myUid()) == PackageManager.PERMISSION_GRANTED; |
+ return mApplicationContext.checkPermission( |
+ Manifest.permission.GET_ACCOUNTS, Process.myPid(), Process.myUid()) |
+ == PackageManager.PERMISSION_GRANTED; |
} |
/** |
@@ -409,8 +410,7 @@ public class AccountManagerHelper { |
public void onPostExecute(T result) { |
if (result != null) { |
mAuthTask.onSuccess(result); |
- } else if (!mIsTransientError.get() |
- || mNumTries.incrementAndGet() >= MAX_TRIES |
+ } else if (!mIsTransientError.get() || mNumTries.incrementAndGet() >= MAX_TRIES |
|| !NetworkChangeNotifier.isInitialized()) { |
// Permanent error, ran out of tries, or we can't listen for network |
// change events; give up. |