| Index: components/sync/test/android/javatests/src/org/chromium/components/sync/test/util/MockAccountManager.java
|
| diff --git a/sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java b/components/sync/test/android/javatests/src/org/chromium/components/sync/test/util/MockAccountManager.java
|
| similarity index 95%
|
| rename from sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java
|
| rename to components/sync/test/android/javatests/src/org/chromium/components/sync/test/util/MockAccountManager.java
|
| index d3421dc7c227a23615ece573d1038141db764d4b..787889fdb367ae3f99c165f59453411457995a05 100644
|
| --- a/sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java
|
| +++ b/components/sync/test/android/javatests/src/org/chromium/components/sync/test/util/MockAccountManager.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.test.util;
|
| +package org.chromium.components.sync.test.util;
|
|
|
| import android.accounts.Account;
|
| import android.accounts.AccountManager;
|
| @@ -14,8 +14,8 @@ import android.os.AsyncTask;
|
| import org.chromium.base.Callback;
|
| import org.chromium.base.Log;
|
| import org.chromium.base.VisibleForTesting;
|
| -import org.chromium.sync.signin.AccountManagerDelegate;
|
| -import org.chromium.sync.signin.AccountManagerHelper;
|
| +import org.chromium.components.sync.signin.AccountManagerDelegate;
|
| +import org.chromium.components.sync.signin.AccountManagerHelper;
|
|
|
| import java.util.ArrayList;
|
| import java.util.HashSet;
|
| @@ -41,7 +41,6 @@ import java.util.concurrent.TimeUnit;
|
| * AccountHolder} builder method alwaysAccept(true).
|
| */
|
| public class MockAccountManager implements AccountManagerDelegate {
|
| -
|
| private static final String TAG = "MockAccountManager";
|
|
|
| protected final Context mContext;
|
| @@ -129,8 +128,7 @@ public class MockAccountManager implements AccountManagerDelegate {
|
| * @param broadcastEvent whether to broadcast an AccountChangedEvent
|
| * @return whether the account holder was added successfully
|
| */
|
| - public boolean addAccountHolderExplicitly(AccountHolder accountHolder,
|
| - boolean broadcastEvent) {
|
| + public boolean addAccountHolderExplicitly(AccountHolder accountHolder, boolean broadcastEvent) {
|
| boolean result = mAccounts.add(accountHolder);
|
| if (broadcastEvent) {
|
| postAsyncAccountChangedEvent();
|
| @@ -150,8 +148,8 @@ public class MockAccountManager implements AccountManagerDelegate {
|
| * @param broadcastEvent whether to broadcast an AccountChangedEvent
|
| * @return whether the account holder was removed successfully
|
| */
|
| - public boolean removeAccountHolderExplicitly(AccountHolder accountHolder,
|
| - boolean broadcastEvent) {
|
| + public boolean removeAccountHolderExplicitly(
|
| + AccountHolder accountHolder, boolean broadcastEvent) {
|
| boolean result = mAccounts.remove(accountHolder);
|
| if (broadcastEvent) {
|
| postAsyncAccountChangedEvent();
|
| @@ -195,7 +193,7 @@ public class MockAccountManager implements AccountManagerDelegate {
|
| AuthenticatorDescription googleAuthenticator = new AuthenticatorDescription(
|
| AccountManagerHelper.GOOGLE_ACCOUNT_TYPE, "p1", 0, 0, 0, 0);
|
|
|
| - return new AuthenticatorDescription[] { googleAuthenticator };
|
| + return new AuthenticatorDescription[] {googleAuthenticator};
|
| }
|
|
|
| @Override
|
|
|