| Index: components/sync/android/java/src/org/chromium/components/sync/AndroidSyncSettings.java
|
| diff --git a/sync/android/java/src/org/chromium/sync/AndroidSyncSettings.java b/components/sync/android/java/src/org/chromium/components/sync/AndroidSyncSettings.java
|
| similarity index 91%
|
| rename from sync/android/java/src/org/chromium/sync/AndroidSyncSettings.java
|
| rename to components/sync/android/java/src/org/chromium/components/sync/AndroidSyncSettings.java
|
| index 426abc5467f17b49f0482e6f5fb5a95e4b823ca3..ac6636cbcafba6271e231d6d181c881b1290995f 100644
|
| --- a/sync/android/java/src/org/chromium/sync/AndroidSyncSettings.java
|
| +++ b/components/sync/android/java/src/org/chromium/components/sync/AndroidSyncSettings.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;
|
| +package org.chromium.components.sync;
|
|
|
| import android.accounts.Account;
|
| import android.content.ContentResolver;
|
| @@ -14,7 +14,7 @@ import android.os.StrictMode;
|
| import org.chromium.base.Callback;
|
| import org.chromium.base.ObserverList;
|
| import org.chromium.base.VisibleForTesting;
|
| -import org.chromium.sync.signin.AccountManagerHelper;
|
| +import org.chromium.components.sync.signin.AccountManagerHelper;
|
|
|
| import javax.annotation.concurrent.ThreadSafe;
|
|
|
| @@ -31,7 +31,6 @@ import javax.annotation.concurrent.ThreadSafe;
|
| */
|
| @ThreadSafe
|
| public class AndroidSyncSettings {
|
| -
|
| public static final String TAG = "AndroidSyncSettings";
|
|
|
| /**
|
| @@ -63,9 +62,7 @@ public class AndroidSyncSettings {
|
| /**
|
| * Provides notifications when Android sync settings have changed.
|
| */
|
| - public interface AndroidSyncSettingsObserver {
|
| - public void androidSyncSettingsChanged();
|
| - }
|
| + public interface AndroidSyncSettingsObserver { public void androidSyncSettingsChanged(); }
|
|
|
| private static void ensureInitialized(Context context) {
|
| synchronized (CLASS_LOCK) {
|
| @@ -78,8 +75,8 @@ public class AndroidSyncSettings {
|
| }
|
|
|
| @VisibleForTesting
|
| - public static void overrideForTests(Context context,
|
| - SyncContentResolverDelegate contentResolver) {
|
| + public static void overrideForTests(
|
| + Context context, SyncContentResolverDelegate contentResolver) {
|
| synchronized (CLASS_LOCK) {
|
| sInstance = new AndroidSyncSettings(context, contentResolver);
|
| }
|
| @@ -89,8 +86,8 @@ public class AndroidSyncSettings {
|
| * @param context the context the ApplicationContext will be retrieved from.
|
| * @param syncContentResolverDelegate an implementation of {@link SyncContentResolverDelegate}.
|
| */
|
| - private AndroidSyncSettings(Context context,
|
| - SyncContentResolverDelegate syncContentResolverDelegate) {
|
| + private AndroidSyncSettings(
|
| + Context context, SyncContentResolverDelegate syncContentResolverDelegate) {
|
| mApplicationContext = context.getApplicationContext();
|
| mSyncContentResolverDelegate = syncContentResolverDelegate;
|
| mContractAuthority = getContractAuthority();
|
| @@ -236,8 +233,10 @@ public class AndroidSyncSettings {
|
| public void onResult(Account[] accounts) {
|
| StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
|
| for (Account account : accounts) {
|
| - if (!account.equals(mAccount) && mSyncContentResolverDelegate.getIsSyncable(
|
| - account, mContractAuthority) > 0) {
|
| + if (!account.equals(mAccount)
|
| + && mSyncContentResolverDelegate.getIsSyncable(
|
| + account, mContractAuthority)
|
| + > 0) {
|
| mSyncContentResolverDelegate.setIsSyncable(account, mContractAuthority, 0);
|
| }
|
| }
|
| @@ -276,8 +275,9 @@ public class AndroidSyncSettings {
|
|
|
| StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
|
| if (mAccount != null) {
|
| - mIsSyncable = mSyncContentResolverDelegate.getIsSyncable(
|
| - mAccount, mContractAuthority) == 1;
|
| + mIsSyncable =
|
| + mSyncContentResolverDelegate.getIsSyncable(mAccount, mContractAuthority)
|
| + == 1;
|
| mChromeSyncEnabled = mSyncContentResolverDelegate.getSyncAutomatically(
|
| mAccount, mContractAuthority);
|
| } else {
|
| @@ -288,7 +288,7 @@ public class AndroidSyncSettings {
|
| StrictMode.setThreadPolicy(oldPolicy);
|
|
|
| return oldChromeSyncEnabled != mChromeSyncEnabled
|
| - || oldMasterSyncEnabled != mMasterSyncEnabled;
|
| + || oldMasterSyncEnabled != mMasterSyncEnabled;
|
| }
|
| }
|
|
|
|
|