Fix ChromeBackgroundServiceWaiter timeout, and restart offline pages

chrome/android/javatests/src/org/chromium/chrome/browser/ChromeBackgroundServiceTest.java

 // Copyright 2016 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;
 
 import android.content.Context;
 import android.support.test.filters.SmallTest;
 import android.test.InstrumentationTestCase;
 
@@ skipping 51 matching lines @@
                 mPrecachingStarted = true;
             }
         }
 
         @Override
         protected void rescheduleBackgroundSyncTasksOnUpgrade() {}
 
         @Override
         protected void reschedulePrecacheTasksOnUpgrade() {}
 
+        @Override
+        protected void rescheduleOfflinePagesTasksOnUpgrade() {}
+
         // Posts an assertion task to the UI thread. Since this is only called after the call
         // to onRunTask, it will be enqueued after any possible call to launchBrowser, and we
         // can reliably check whether launchBrowser was called.
         protected void checkExpectations(final boolean expectedLaunchBrowser,
                 final boolean expectedPrecacheStarted, final boolean expectedFetchSnippets,
                 final boolean expectedRescheduleFetching) {
             ThreadUtils.runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
                     assertEquals("StartedService", expectedLaunchBrowser, mDidLaunchBrowser);
@@ skipping 130 matching lines @@
         deleteSnippetsLauncherInstance();
         // Set the pref indicating that fetching was scheduled before.
         ContextUtils.getAppSharedPreferences()
                 .edit()
                 .putBoolean(SnippetsLauncher.PREF_IS_SCHEDULED, true)
                 .apply();
 
         startOnInitializeTasksAndVerify(/*shouldStart=*/true, /*shouldReschedule=*/true);
     }
 }