[Sync] //components/sync internal changes [DO NOT SUBMIT]

components/sync/android/javatests/src/org/chromium/components/sync/AndroidSyncSettingsTest.java

 // 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.sync;
+package org.chromium.components.sync;
 
 import android.accounts.Account;
 import android.content.Context;
 import android.os.Bundle;
 import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
-import org.chromium.sync.AndroidSyncSettings.AndroidSyncSettingsObserver;
-import org.chromium.sync.signin.AccountManagerHelper;
-import org.chromium.sync.test.util.AccountHolder;
-import org.chromium.sync.test.util.MockAccountManager;
-import org.chromium.sync.test.util.MockSyncContentResolverDelegate;
+import org.chromium.components.sync.AndroidSyncSettings.AndroidSyncSettingsObserver;
+import org.chromium.components.sync.signin.AccountManagerHelper;
+import org.chromium.components.sync.test.util.AccountHolder;
+import org.chromium.components.sync.test.util.MockAccountManager;
+import org.chromium.components.sync.test.util.MockSyncContentResolverDelegate;
 
 /**
  * Tests for AndroidSyncSettings.
  */
 @DisabledTest(message = "https://crbug.com/605567")
 public class AndroidSyncSettingsTest extends InstrumentationTestCase {
-
     private static class CountingMockSyncContentResolverDelegate
             extends MockSyncContentResolverDelegate {
         private int mGetMasterSyncAutomaticallyCalls;
         private int mGetSyncAutomaticallyCalls;
         private int mGetIsSyncableCalls;
         private int mSetIsSyncableCalls;
         private int mSetSyncAutomaticallyCalls;
         private int mRemovePeriodicSyncCalls;
 
         @Override
@@ skipping 122 matching lines @@
         // mAlternateAccount was set to be syncable and not have periodic syncs.
         assertEquals(3, mSyncContentResolverDelegate.mSetIsSyncableCalls);
         assertEquals(2, mSyncContentResolverDelegate.mRemovePeriodicSyncCalls);
     }
 
     @SmallTest
     @Feature({"Sync"})
     public void testToggleMasterSyncFromSettings() throws InterruptedException {
         mSyncContentResolverDelegate.setMasterSyncAutomatically(true);
         mSyncContentResolverDelegate.waitForLastNotificationCompleted();
-        assertTrue("master sync should be set",
-                AndroidSyncSettings.isMasterSyncEnabled(mContext));
+        assertTrue("master sync should be set", AndroidSyncSettings.isMasterSyncEnabled(mContext));
 
         mSyncContentResolverDelegate.setMasterSyncAutomatically(false);
         mSyncContentResolverDelegate.waitForLastNotificationCompleted();
-        assertFalse("master sync should be unset",
-                AndroidSyncSettings.isMasterSyncEnabled(mContext));
+        assertFalse(
+                "master sync should be unset", AndroidSyncSettings.isMasterSyncEnabled(mContext));
     }
 
     @SmallTest
     @Feature({"Sync"})
     public void testToggleChromeSyncFromSettings() throws InterruptedException {
         // Turn on syncability.
         mSyncContentResolverDelegate.setMasterSyncAutomatically(true);
         mSyncContentResolverDelegate.waitForLastNotificationCompleted();
 
         // First sync
@@ skipping 53 matching lines @@
         mSyncContentResolverDelegate.setMasterSyncAutomatically(true);
         mSyncContentResolverDelegate.waitForLastNotificationCompleted();
 
         enableChromeSyncOnUiThread();
         mSyncContentResolverDelegate.waitForLastNotificationCompleted();
         assertTrue("account should be synced", AndroidSyncSettings.isSyncEnabled(mContext));
 
         AndroidSyncSettings.updateAccount(mContext, mAlternateAccount);
         enableChromeSyncOnUiThread();
         mSyncContentResolverDelegate.waitForLastNotificationCompleted();
-        assertTrue("alternate account should be synced",
-                AndroidSyncSettings.isSyncEnabled(mContext));
+        assertTrue(
+                "alternate account should be synced", AndroidSyncSettings.isSyncEnabled(mContext));
 
         disableChromeSyncOnUiThread();
         mSyncContentResolverDelegate.waitForLastNotificationCompleted();
         assertFalse("alternate account should not be synced",
                 AndroidSyncSettings.isSyncEnabled(mContext));
         AndroidSyncSettings.updateAccount(mContext, mAccount);
         assertTrue("account should still be synced", AndroidSyncSettings.isSyncEnabled(mContext));
 
         // Ensure we don't erroneously re-use cached data.
         AndroidSyncSettings.updateAccount(mContext, null);
-        assertFalse("null account should not be synced",
-                AndroidSyncSettings.isSyncEnabled(mContext));
+        assertFalse(
+                "null account should not be synced", AndroidSyncSettings.isSyncEnabled(mContext));
     }
 
     @SmallTest
     @Feature({"Sync"})
     public void testSyncSettingsCaching() throws InterruptedException {
         // Turn on syncability.
         mSyncContentResolverDelegate.setMasterSyncAutomatically(true);
         mSyncContentResolverDelegate.waitForLastNotificationCompleted();
 
         enableChromeSyncOnUiThread();
@@ skipping 106 matching lines @@
         assertTrue(mSyncContentResolverDelegate.getIsSyncable(mAccount, mAuthority) == 0);
         assertTrue(mSyncContentResolverDelegate.getSyncAutomatically(mAccount, mAuthority));
 
         // Ensure bug is fixed.
         AndroidSyncSettings.enableChromeSync(mContext);
         assertTrue(mSyncContentResolverDelegate.getIsSyncable(mAccount, mAuthority) == 1);
         // Should still be enabled.
         assertTrue(mSyncContentResolverDelegate.getSyncAutomatically(mAccount, mAuthority));
     }
 }