Fix ChromeBackgroundServiceWaiter timeout, and restart offline pages

chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.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.os.Bundle;
 
 import com.google.android.gms.gcm.GcmNetworkManager;
 import com.google.android.gms.gcm.GcmTaskService;
 import com.google.android.gms.gcm.TaskParams;
 
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.base.library_loader.ProcessInitException;
 import org.chromium.chrome.browser.download.DownloadResumptionScheduler;
 import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
 import org.chromium.chrome.browser.ntp.snippets.SnippetsBridge;
 import org.chromium.chrome.browser.ntp.snippets.SnippetsLauncher;
 import org.chromium.chrome.browser.offlinepages.BackgroundOfflinerTask;
+import org.chromium.chrome.browser.offlinepages.BackgroundScheduler;
 import org.chromium.chrome.browser.offlinepages.BackgroundSchedulerProcessorImpl;
 import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
 import org.chromium.chrome.browser.precache.PrecacheController;
 import org.chromium.chrome.browser.precache.PrecacheUMA;
 
 /**
  * {@link ChromeBackgroundService} is scheduled through the {@link GcmNetworkManager} when the
  * browser needs to be launched for scheduled tasks, or in response to changing network or power
  * conditions.
  *
  * If HOLD_WAKELOCK is set to true in a bundle in the task params, then the ChromeBackgroundService
  * will wait until the task reports done before returning control to the {@link GcmNetworkManager}.
  * This both guarantees that the wakelock keeps chrome awake and that the GcmNetworkManager does not
  * start another task in place of the one just started.  The GcmNetworkManager can start more than
  * one task concurrently, thought, so it does not guarantee that a different task won't start.
  */
 public class ChromeBackgroundService extends GcmTaskService {
     private static final String TAG = "BackgroundService";
     /** Bundle key to use to specify we should block the GcmNetworkManager thread until the task on
      * the UI thread is done before returning to the GcmNetworkManager.
      */
     public static final String HOLD_WAKELOCK = "HoldWakelock";
-    private static final int WAKELOCK_TIMEOUT_SECONDS = 4 * 60;
+    // GCM will return our wakelock after 3 minutes, we should be a second less than that.
+    private static final int WAKELOCK_TIMEOUT_SECONDS = 3 * 60 - 1;
 
     private BackgroundOfflinerTask mBackgroundOfflinerTask;
 
     @Override
     @VisibleForTesting
     public int onRunTask(final TaskParams params) {
         final String taskTag = params.getTag();
         Log.i(TAG, "[" + taskTag + "] Woken up at " + new java.util.Date().toString());
         final ChromeBackgroundServiceWaiter waiter = getWaiterIfNeeded(params.getExtras());
         final Context context = this;
@@ skipping 160 matching lines @@
 
     private void rescheduleSnippetsTasksOnUpgrade() {
         if (SnippetsLauncher.shouldRescheduleTasksOnUpgrade()) {
             if (!SnippetsLauncher.hasInstance()) {
                 launchBrowser(this, /*tag=*/""); // The |tag| doesn't matter here.
             }
             rescheduleFetching();
         }
     }
 
+    protected void rescheduleOfflinePagesTasksOnUpgrade() {
+        BackgroundScheduler.getInstance(this).rescheduleOfflinePagesTasksOnUpgrade();
+    }
+
     @Override
     public void onInitializeTasks() {
         rescheduleBackgroundSyncTasksOnUpgrade();
         reschedulePrecacheTasksOnUpgrade();
         rescheduleSnippetsTasksOnUpgrade();
+        rescheduleOfflinePagesTasksOnUpgrade();
     }
 }