Fix ChromeBackgroundServiceWaiter timeout, and restart offline pages

chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/BackgroundSchedulerTest.java

Index: chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/BackgroundSchedulerTest.java
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/BackgroundSchedulerTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/BackgroundSchedulerTest.java
index 2fa8a536141dd184553fd03576289a6d68080acb..5609f8e1e101aed8ed54060ecdb80dd2478604ca 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/BackgroundSchedulerTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/BackgroundSchedulerTest.java
@@ -35,6 +35,8 @@ public class BackgroundSchedulerTest {
     private Context mContext;
     private TriggerConditions mConditions1 = new TriggerConditions(
             true /* power */, 10 /* battery percentage */, false /* unmetered */);
+    private TriggerConditions mConditions2 = new TriggerConditions(
+            false /* power */, 0 /* battery percentage */, false /* unmetered */);
     private ShadowGcmNetworkManager mGcmNetworkManager;
 
     @Before
@@ -73,4 +75,21 @@ public class BackgroundSchedulerTest {
         BackgroundScheduler.getInstance(mContext).cancel();
         assertNotNull(mGcmNetworkManager.getCanceledTask());
     }
+
+    @Test
+    @Feature({"OfflinePages"})
+    public void testReschedulOnUpgrade() {
+        assertNull(mGcmNetworkManager.getScheduledTask());
+        BackgroundScheduler.getInstance(mContext).rescheduleOfflinePagesTasksOnUpgrade();
+        // Check with gcmNetworkManagerShadow that schedule got called.
+        assertNotNull(mGcmNetworkManager.getScheduledTask());
+
+        // Verify details of the scheduled task.
+        Task task = mGcmNetworkManager.getScheduledTask();
+        assertEquals(OfflinePageUtils.TASK_TAG, task.getTag());
+        long scheduledTimeMillis = TaskExtrasPacker.unpackTimeFromBundle(task.getExtras());
+        assertTrue(scheduledTimeMillis > 0L);
+        assertEquals(
+                mConditions2, TaskExtrasPacker.unpackTriggerConditionsFromBundle(task.getExtras()));
+    }
 }