Fix the DCHECK failure when starting and stopping GCMClient immediately

components/gcm_driver/gcm_client_impl_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_client_impl.h"
 
 #include "base/command_line.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 201 matching lines @@
 class GCMClientImplTest : public testing::Test,
                           public GCMClient::Delegate {
  public:
   GCMClientImplTest();
   virtual ~GCMClientImplTest();
 
   virtual void SetUp() OVERRIDE;
 
   void BuildGCMClient(base::TimeDelta clock_step);
   void InitializeGCMClient();
+  void StartGCMClient();
   void ReceiveMessageFromMCS(const MCSMessage& message);
   void CompleteCheckin(uint64 android_id,
                        uint64 security_token,
                        const std::string& digest,
                        const std::map<std::string, std::string>& settings);
   void CompleteRegistration(const std::string& registration_id);
   void CompleteUnregistration(const std::string& app_id);
 
   bool ExistsRegistration(const std::string& app_id) const;
   void AddRegistration(const std::string& app_id,
@@ skipping 94 matching lines @@
 }
 
 GCMClientImplTest::~GCMClientImplTest() {}
 
 void GCMClientImplTest::SetUp() {
   testing::Test::SetUp();
   ASSERT_TRUE(CreateUniqueTempDir());
   InitializeLoop();
   BuildGCMClient(base::TimeDelta());
   InitializeGCMClient();
+  StartGCMClient();
   CompleteCheckin(kDeviceAndroidId,
                   kDeviceSecurityToken,
                   std::string(),
                   std::map<std::string, std::string>());
 }
 
 void GCMClientImplTest::PumpLoop() {
   run_loop_->Run();
   run_loop_.reset(new base::RunLoop());
 }
@@ skipping 99 matching lines @@
 
   // Actual initialization.
   GCMClient::ChromeBuildInfo chrome_build_info;
   gcm_client_->Initialize(chrome_build_info,
                           temp_directory_.path(),
                           std::vector<std::string>(),
                           message_loop_.message_loop_proxy(),
                           url_request_context_getter_,
                           make_scoped_ptr<Encryptor>(new FakeEncryptor),
                           this);
+}
 
+void GCMClientImplTest::StartGCMClient() {
   // Start loading and check-in.
   gcm_client_->Start();
 
   PumpLoopUntilIdle();
 }
 
 void GCMClientImplTest::ReceiveMessageFromMCS(const MCSMessage& message) {
   gcm_client_->OnMessageReceivedFromMCS(message);
 }
 
@@ skipping 83 matching lines @@
   EXPECT_TRUE(ExistsRegistration(kAppId));
 
   EXPECT_EQ(kAppId, last_app_id());
   EXPECT_EQ("reg_id", last_registration_id());
   EXPECT_EQ(GCMClient::SUCCESS, last_result());
   EXPECT_EQ(REGISTRATION_COMPLETED, last_event());
 
   // Recreate GCMClient in order to load from the persistent store.
   BuildGCMClient(base::TimeDelta());
   InitializeGCMClient();
+  StartGCMClient();
 
   EXPECT_TRUE(ExistsRegistration(kAppId));
 }
 
 TEST_F(GCMClientImplTest, UnregisterApp) {
   EXPECT_FALSE(ExistsRegistration(kAppId));
 
   std::vector<std::string> senders;
   senders.push_back("sender");
   gcm_client()->Register(kAppId, senders);
@@ skipping 128 matching lines @@
 
 void GCMClientImplCheckinTest::SetUp() {
   testing::Test::SetUp();
   // Creating unique temp directory that will be used by GCMStore shared between
   // GCM Client and G-services settings.
   ASSERT_TRUE(CreateUniqueTempDir());
   InitializeLoop();
   // Time will be advancing one hour every time it is checked.
   BuildGCMClient(base::TimeDelta::FromSeconds(kSettingsCheckinInterval));
   InitializeGCMClient();
+  StartGCMClient();
 }
 
 TEST_F(GCMClientImplCheckinTest, GServicesSettingsAfterInitialCheckin) {
   std::map<std::string, std::string> settings;
   settings["checkin_interval"] = base::Int64ToString(kSettingsCheckinInterval);
   settings["checkin_url"] = "http://alternative.url/checkin";
   settings["gcm_hostname"] = "alternative.gcm.host";
   settings["gcm_secure_port"] = "7777";
   settings["gcm_registration_url"] = "http://alternative.url/registration";
   CompleteCheckin(kDeviceAndroidId,
@@ skipping 40 matching lines @@
   settings["gcm_hostname"] = "alternative.gcm.host";
   settings["gcm_secure_port"] = "7777";
   settings["gcm_registration_url"] = "http://alternative.url/registration";
   CompleteCheckin(kDeviceAndroidId,
                   kDeviceSecurityToken,
                   GServicesSettings::CalculateDigest(settings),
                   settings);
 
   BuildGCMClient(base::TimeDelta());
   InitializeGCMClient();
+  StartGCMClient();
 
   EXPECT_EQ(base::TimeDelta::FromSeconds(kSettingsCheckinInterval),
             gservices_settings().GetCheckinInterval());
   EXPECT_EQ(GURL("http://alternative.url/checkin"),
             gservices_settings().GetCheckinURL());
   EXPECT_EQ(GURL("http://alternative.url/registration"),
             gservices_settings().GetRegistrationURL());
   EXPECT_EQ(GURL("https://alternative.gcm.host:7777"),
             gservices_settings().GetMCSMainEndpoint());
   EXPECT_EQ(GURL("https://alternative.gcm.host:443"),
             gservices_settings().GetMCSFallbackEndpoint());
 }
 
+class GCMClientImplStartAndStopTest : public GCMClientImplTest {
+public:
+  GCMClientImplStartAndStopTest();
+  virtual ~GCMClientImplStartAndStopTest();
+
+  virtual void SetUp() OVERRIDE;
+};
+
+GCMClientImplStartAndStopTest::GCMClientImplStartAndStopTest() {
+}
+
+GCMClientImplStartAndStopTest::~GCMClientImplStartAndStopTest() {
+}
+
+void GCMClientImplStartAndStopTest::SetUp() {
+  testing::Test::SetUp();
+  ASSERT_TRUE(CreateUniqueTempDir());
+  InitializeLoop();
+  BuildGCMClient(base::TimeDelta());
+  InitializeGCMClient();
+}
+
+TEST_F(GCMClientImplStartAndStopTest, StartStopAndRestart) {
+  // Start the GCM and wait until it is ready.
+  gcm_client()->Start();
+  PumpLoopUntilIdle();
+
+  // Stop the GCM.
+  gcm_client()->Stop();
+  PumpLoopUntilIdle();
+
+  // Restart the GCM.
+  gcm_client()->Start();
+  PumpLoopUntilIdle();
+}
+
+TEST_F(GCMClientImplStartAndStopTest, StartAndStopImmediately) {
+  // Start the GCM and then stop it immediately.
+  gcm_client()->Start();
+  gcm_client()->Stop();
+
+  PumpLoopUntilIdle();
+}
+
+TEST_F(GCMClientImplStartAndStopTest, StartStopAndRestartImmediately) {
+  // Start the GCM and then stop and restart it immediately.
+  gcm_client()->Start();
+  gcm_client()->Stop();
+  gcm_client()->Start();
+
+  PumpLoopUntilIdle();
+}
+
 }  // namespace gcm