Rewrite AndroidSyncSettings to be significantly simpler.

chrome/android/javatests/src/org/chromium/chrome/browser/invalidation/InvalidationServiceTest.java

 // Copyright 2013 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.chrome.browser.invalidation;
 
 import android.content.Intent;
 import android.test.UiThreadTest;
 import android.test.suitebuilder.annotation.SmallTest;
 
@@ skipping 18 matching lines @@
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         startChromeBrowserProcessSync(getInstrumentation().getTargetContext());
         mContext = new IntentSavingContext(getInstrumentation().getTargetContext());
         // We don't want to use the system content resolver, so we override it.
         MockSyncContentResolverDelegate delegate = new MockSyncContentResolverDelegate();
         // Android master sync can safely always be on.
         delegate.setMasterSyncAutomatically(true);
-        AndroidSyncSettings.overrideAndroidSyncSettingsForTests(mContext, delegate);
+        AndroidSyncSettings.overrideForTests(mContext, delegate);
     }
 
     @SmallTest
     @UiThreadTest
     @Feature({"Sync"})
     public void testSetRegisteredObjectIds() {
         InvalidationService service = InvalidationServiceFactory.getForTest(mContext);
         ObjectId bookmark = ModelType.BOOKMARK.toObjectId();
         service.setRegisteredObjectIds(new int[] {1, 2, bookmark.getSource()},
                                           new String[] {"a", "b", new String(bookmark.getName())});
@@ skipping 17 matching lines @@
     /**
      * Asserts that {@code intent} is destined for the correct component.
      */
     private static void validateIntentComponent(Intent intent) {
         assertNotNull(intent.getComponent());
         assertEquals(InvalidationClientService.class.getName(),
                 intent.getComponent().getClassName());
     }
 
 }