[Sync] Try to fix PrecacheLauncher test flakiness.

chrome/android/javatests/src/org/chromium/chrome/browser/precache/PrecacheLauncherTest.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.chrome.browser.precache;
 
 import android.content.Context;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import com.google.android.gms.gcm.Task;
 
+import org.chromium.base.ContextUtils;
 import org.chromium.base.ThreadUtils;
-import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
-import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
 import org.chromium.content.browser.test.NativeLibraryTestBase;
 
 import java.util.EnumSet;
 import java.util.concurrent.Callable;
 
 /**
  * Unit tests for {@link PrecacheLauncher}.
  *
  * setUp/tearDown code was inspired by org.chromium.chrome.browser.sync.ui.PassphraseActivityTest.
@@ skipping 50 matching lines @@
 
         @Override
         boolean cancelTask(Context context, String tag) {
             return true;
         }
     }
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
+        ContextUtils.initApplicationContext(getTargetContext().getApplicationContext());
+
         // This is a PrecacheLauncher with a stubbed out nativeShouldRun so we can change that on
         // the fly without needing to set up a sync backend.
         mLauncher = new PrecacheLauncherUnderTest();
 
         mPrecacheTaskScheduler = new MockPrecacheTaskScheduler();
         PrecacheController.setTaskScheduler(mPrecacheTaskScheduler);
 
         // The target context persists throughout the entire test run, and so leaks state between
         // tests. We reset the is_precaching_enabled pref to false to make the test run consistent,
         // in case another test class has modified this pref.
@@ skipping 17 matching lines @@
 
     @Override
     protected void tearDown() throws Exception {
         ProfileSyncService.overrideForTests(null);
         PrecacheController.setIsPrecachingEnabled(getTargetContext(), false);
         super.tearDown();
     }
 
     @SmallTest
     @Feature({"Precache"})
-    @RetryOnFailure
     public void testUpdateEnabled_SyncNotReady_ThenDisabled() {
         mLauncher.updateEnabled(getTargetContext());
         waitUntilUiThreadIdle();
 
         assertEquals(false, isPrecachingEnabled());
         assertEquals(EnumSet.of(FailureReason.SYNC_NOT_INITIALIZED,
                              FailureReason.PRERENDER_PRIVACY_PREFERENCE_NOT_ENABLED,
                              FailureReason.NATIVE_SHOULD_RUN_IS_FALSE),
                 failureReasons());
 
         setSyncInitialized(true);
         assertEquals(false, isPrecachingEnabled());
         assertEquals(EnumSet.of(FailureReason.NATIVE_SHOULD_RUN_IS_FALSE), failureReasons());
     }
 
     @SmallTest
     @Feature({"Precache"})
-    @RetryOnFailure
     public void testUpdateEnabled_SyncNotReady_ThenEnabled() {
         mLauncher.updateEnabled(getTargetContext());
         waitUntilUiThreadIdle();
 
         assertEquals(false, isPrecachingEnabled());
         assertEquals(EnumSet.of(FailureReason.SYNC_NOT_INITIALIZED,
                              FailureReason.PRERENDER_PRIVACY_PREFERENCE_NOT_ENABLED,
                              FailureReason.NATIVE_SHOULD_RUN_IS_FALSE),
                 failureReasons());
 
         mLauncher.setShouldRun(true);
         setSyncInitialized(true);
         assertEquals(true, isPrecachingEnabled());
         assertEquals(EnumSet.noneOf(FailureReason.class), failureReasons());
     }
 
     @SmallTest
     @Feature({"Precache"})
-    @RetryOnFailure
     public void testUpdateEnabled_Disabled_ThenEnabled() {
         setSyncInitialized(true);
         mLauncher.updateEnabled(getTargetContext());
         waitUntilUiThreadIdle();
 
         assertEquals(false, isPrecachingEnabled());
         assertEquals(EnumSet.of(FailureReason.NATIVE_SHOULD_RUN_IS_FALSE), failureReasons());
 
         mLauncher.setShouldRun(true);
         assertEquals(true, isPrecachingEnabled());
         assertEquals(EnumSet.noneOf(FailureReason.class), failureReasons());
     }
 
     @SmallTest
     @Feature({"Precache"})
-    @RetryOnFailure
     public void testUpdateEnabled_Enabled_ThenDisabled() {
         mLauncher.setShouldRun(true);
         setSyncInitialized(true);
         mLauncher.updateEnabled(getTargetContext());
         waitUntilUiThreadIdle();
 
         assertEquals(true, isPrecachingEnabled());
         assertEquals(EnumSet.noneOf(FailureReason.class), failureReasons());
 
         mLauncher.setShouldRun(false);
         assertEquals(false, isPrecachingEnabled());
         assertEquals(EnumSet.of(FailureReason.NATIVE_SHOULD_RUN_IS_FALSE), failureReasons());
     }
 
     @SmallTest
     @Feature({"Precache"})
-    @RetryOnFailure
-    @DisabledTest(message = "crbug.com/648749")
     public void testUpdateEnabledNullProfileSyncService() {
         ProfileSyncService.overrideForTests(null);
 
         mLauncher.updateEnabled(getTargetContext());
         waitUntilUiThreadIdle();
 
         assertEquals(false, isPrecachingEnabled());
         assertEquals(EnumSet.of(FailureReason.SYNC_NOT_INITIALIZED,
                              FailureReason.PRERENDER_PRIVACY_PREFERENCE_NOT_ENABLED,
                              FailureReason.NATIVE_SHOULD_RUN_IS_FALSE),
@@ skipping 38 matching lines @@
     /** Notify listeners that sync preferences have changed. This is run by setShouldRun. */
     private void notifySyncChanged() {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 mSync.syncStateChanged();
             }
         });
     }
 }