Fix ChromeBackgroundServiceWaiter timeout, and restart offline pages

chrome/android/junit/src/org/chromium/chrome/browser/offlinepages/BackgroundSchedulerTest.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.offlinepages;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ skipping 16 matching lines @@
 /**
  * Unit tests for BackgroundScheduler.
  */
 @RunWith(OfflinePageTestRunner.class)
 @Config(manifest = Config.NONE, application = BaseChromiumApplication.class,
         shadows = {ShadowGcmNetworkManager.class, ShadowGoogleApiAvailability.class})
 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
     public void setUp() throws Exception {
         mContext = RuntimeEnvironment.application;
         mGcmNetworkManager = (ShadowGcmNetworkManager) ShadowExtractor.extract(
                 GcmNetworkManager.getInstance(mContext));
         mGcmNetworkManager.clear();
     }
 
@@ skipping 18 matching lines @@
     @Feature({"OfflinePages"})
     public void testCancel() {
         assertNull(mGcmNetworkManager.getScheduledTask());
         BackgroundScheduler.getInstance(mContext).schedule(mConditions1);
         assertNotNull(mGcmNetworkManager.getScheduledTask());
 
         assertNull(mGcmNetworkManager.getCanceledTask());
         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()));
+    }
 }