[GCM] Start GCMChannelStatusSyncer when GCM is disabled

components/gcm_driver/gcm_driver_desktop_unittest.cc

 // Copyright 2014 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.
 
 #include "components/gcm_driver/gcm_driver_desktop.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/location.h"
@@ skipping 999 matching lines @@
 
 GCMChannelStatusSyncerTest::GCMChannelStatusSyncerTest() {
 }
 
 GCMChannelStatusSyncerTest::~GCMChannelStatusSyncerTest() {
 }
 
 void GCMChannelStatusSyncerTest::SetUp() {
   GCMDriverTest::SetUp();
 
+  url_fetcher_factory_.set_remove_fetcher_on_delete(true);
+
   // Turn on all-user support.
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("GCM", "Enabled"));
 }
 
 void GCMChannelStatusSyncerTest::CompleteGCMChannelStatusRequest(
     bool enabled, int poll_interval_seconds) {
   sync_pb::ExperimentStatusResponse response_proto;
   sync_pb::ExperimentsSpecifics* experiment_specifics =
       response_proto.add_experiment();
   experiment_specifics->mutable_gcm_channel()->set_enabled(enabled);
@@ skipping 54 matching lines @@
   // Wait until next GCM channel status request gets triggered.
   PumpUILoop();
 
   // Complete the request that enables the GCM.
   CompleteGCMChannelStatusRequest(true, 0);
   EXPECT_TRUE(driver()->gcm_enabled());
   EXPECT_TRUE(syncer()->gcm_enabled());
   EXPECT_TRUE(driver()->IsStarted());
 }
 
-TEST_F(GCMChannelStatusSyncerTest, DisableAndRestart) {
+TEST_F(GCMChannelStatusSyncerTest, DisableRestartAndEnable) {
   // Create GCMDriver first. GCM is not started.
   CreateDriver(FakeGCMClient::NO_DELAY_START);
   EXPECT_FALSE(driver()->IsStarted());
 
   // By default, GCM is enabled.
   EXPECT_TRUE(driver()->gcm_enabled());
   EXPECT_TRUE(syncer()->gcm_enabled());
 
   // Remove delay such that the request could be executed immediately.
   syncer()->set_delay_removed_for_testing(true);
@@ skipping 12 matching lines @@
   // Complete the request that disables the GCM.
   CompleteGCMChannelStatusRequest(false, 0);
   EXPECT_FALSE(driver()->gcm_enabled());
   EXPECT_FALSE(syncer()->gcm_enabled());
   EXPECT_FALSE(driver()->IsStarted());
 
   // Simulate browser start by recreating GCMDriver.
   ShutdownDriver();
   CreateDriver(FakeGCMClient::NO_DELAY_START);
 
+  // Remove delay such that the request could be executed immediately.
+  syncer()->set_delay_removed_for_testing(true);
+
   // GCM is still disabled.
   EXPECT_FALSE(driver()->gcm_enabled());
   EXPECT_FALSE(syncer()->gcm_enabled());
   EXPECT_FALSE(driver()->IsStarted());
 
   AddAppHandlers();
   EXPECT_FALSE(driver()->gcm_enabled());
   EXPECT_FALSE(syncer()->gcm_enabled());
   EXPECT_FALSE(driver()->IsStarted());
+
+  // Wait until the GCM channel status request gets triggered.
+  PumpUILoop();
+
+  // Complete the request that re-enables the GCM.
+  CompleteGCMChannelStatusRequest(true, 0);
+  EXPECT_TRUE(driver()->gcm_enabled());
+  EXPECT_TRUE(syncer()->gcm_enabled());
+  EXPECT_TRUE(driver()->IsStarted());
 }
 
 TEST_F(GCMChannelStatusSyncerTest, FirstTimePolling) {
   // Start GCM.
   CreateDriver(FakeGCMClient::NO_DELAY_START);
   AddAppHandlers();
 
   // The 1st request should be triggered shortly without jittering.
   EXPECT_EQ(GCMChannelStatusSyncer::first_time_delay_seconds(),
             syncer()->current_request_delay_interval().InSeconds());
@@ skipping 78 matching lines @@
   // After start-up, the request should still be scheduled at the expected
   // updated interval.
   actual_delay_seconds =
       syncer()->current_request_delay_interval().InSeconds();
   EXPECT_TRUE(CompareDelaySeconds(expected_delay_seconds, actual_delay_seconds))
       << "expected delay: " << expected_delay_seconds
       << " actual delay: " << actual_delay_seconds;
 }
 
 }  // namespace gcm