Do not create GCM store if it is not needed

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/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 332 matching lines @@
   }
 
   const GServicesSettings& gservices_settings() const {
     return gcm_client_->gservices_settings_;
   }
 
   const base::FilePath& temp_directory_path() const {
     return temp_directory_.path();
   }
 
+  base::FilePath gcm_store_path() const {
+    // Pass an non-existent directory as store path to match the exact
+    // behavior in the production code. Currently GCMStoreImpl checks if
+    // the directory exist or not to determine the store existence.
+    return temp_directory_.path().Append(FILE_PATH_LITERAL("GCM Store"));
+  }
+
   int64 CurrentTime();
 
   // Tooling.
   void PumpLoop();
   void PumpLoopUntilIdle();
   void QuitLoop();
   void InitializeLoop();
   bool CreateUniqueTempDir();
   AutoAdvancingTestClock* clock() const {
     return reinterpret_cast<AutoAdvancingTestClock*>(gcm_client_->clock_.get());
@@ skipping 154 matching lines @@
   registration->sender_ids = sender_ids;
   gcm_client_->registrations_[registration] = registration_id;
 }
 
 void GCMClientImplTest::InitializeGCMClient() {
   clock()->Advance(base::TimeDelta::FromMilliseconds(1));
 
   // Actual initialization.
   GCMClient::ChromeBuildInfo chrome_build_info;
   chrome_build_info.version = kChromeVersion;
-  gcm_client_->Initialize(chrome_build_info, temp_directory_.path(),
-                          message_loop_.task_runner(),
-                          url_request_context_getter_,
-                          make_scoped_ptr<Encryptor>(new FakeEncryptor), this);
+  gcm_client_->Initialize(
+      chrome_build_info,
+      gcm_store_path(),
+      message_loop_.task_runner(),
+      url_request_context_getter_,
+      make_scoped_ptr<Encryptor>(new FakeEncryptor),
+      this);
 }
 
 void GCMClientImplTest::StartGCMClient() {
   // Start loading and check-in.
   gcm_client_->Start(GCMClient::IMMEDIATE_START);
 
   PumpLoopUntilIdle();
 }
 
 void GCMClientImplTest::Register(const std::string& app_id,
@@ skipping 97 matching lines @@
   EXPECT_TRUE(device_checkin_info().account_tokens.empty());
 }
 
 TEST_F(GCMClientImplTest, LoadingBusted) {
   // Close the GCM store.
   gcm_client()->Stop();
   PumpLoopUntilIdle();
 
   // Mess up the store.
   base::FilePath store_file_path =
-      temp_directory_path().Append(FILE_PATH_LITERAL("CURRENT"));
+      gcm_store_path().Append(FILE_PATH_LITERAL("CURRENT"));
   ASSERT_TRUE(base::AppendToFile(store_file_path, "A", 1));
 
   // Restart GCM client. The store should be reset and the loading should
   // complete successfully.
   reset_last_event();
   BuildGCMClient(base::TimeDelta());
   InitializeGCMClient();
   StartGCMClient();
   CompleteCheckin(kDeviceAndroidId2,
                   kDeviceSecurityToken2,
@@ skipping 441 matching lines @@
   PumpLoopUntilIdle();
 }
 
 TEST_F(GCMClientImplStartAndStopTest, StartStopAndRestart) {
   // GCMClientImpl should be in INITIALIZED state at first.
   EXPECT_EQ(GCMClientImpl::INITIALIZED, gcm_client_state());
 
   // Delay start the GCM.
   gcm_client()->Start(GCMClient::DELAYED_START);
   PumpLoopUntilIdle();
-  EXPECT_EQ(GCMClientImpl::LOADED, gcm_client_state());
+  EXPECT_EQ(GCMClientImpl::INITIALIZED, gcm_client_state());
 
   // Stop the GCM.
   gcm_client()->Stop();
   PumpLoopUntilIdle();
   EXPECT_EQ(GCMClientImpl::INITIALIZED, gcm_client_state());
 
   // Restart the GCM without delay.
   gcm_client()->Start(GCMClient::IMMEDIATE_START);
   PumpLoopUntilIdle();
   EXPECT_EQ(GCMClientImpl::INITIAL_DEVICE_CHECKIN, gcm_client_state());
 }
 
-TEST_F(GCMClientImplStartAndStopTest, StartAndStopImmediately) {
+TEST_F(GCMClientImplStartAndStopTest, DelayedStartAndStopImmediately) {
   // GCMClientImpl should be in INITIALIZED state at first.
   EXPECT_EQ(GCMClientImpl::INITIALIZED, gcm_client_state());
 
   // Delay start the GCM and then stop it immediately.
   gcm_client()->Start(GCMClient::DELAYED_START);
   gcm_client()->Stop();
   PumpLoopUntilIdle();
   EXPECT_EQ(GCMClientImpl::INITIALIZED, gcm_client_state());
+}
+
+TEST_F(GCMClientImplStartAndStopTest, ImmediateStartAndStopImmediately) {
+  // GCMClientImpl should be in INITIALIZED state at first.
+  EXPECT_EQ(GCMClientImpl::INITIALIZED, gcm_client_state());
 
   // Start the GCM and then stop it immediately.
   gcm_client()->Start(GCMClient::IMMEDIATE_START);
   gcm_client()->Stop();
   PumpLoopUntilIdle();
   EXPECT_EQ(GCMClientImpl::INITIALIZED, gcm_client_state());
 }
 
-TEST_F(GCMClientImplStartAndStopTest, StartStopAndRestartImmediately) {
+TEST_F(GCMClientImplStartAndStopTest, DelayedStartStopAndRestart) {
   // GCMClientImpl should be in INITIALIZED state at first.
   EXPECT_EQ(GCMClientImpl::INITIALIZED, gcm_client_state());
 
   // Delay start the GCM and then stop and restart it immediately.
   gcm_client()->Start(GCMClient::DELAYED_START);
   gcm_client()->Stop();
   gcm_client()->Start(GCMClient::DELAYED_START);
   PumpLoopUntilIdle();
-  EXPECT_EQ(GCMClientImpl::LOADED, gcm_client_state());
+  EXPECT_EQ(GCMClientImpl::INITIALIZED, gcm_client_state());
+}
+
+TEST_F(GCMClientImplStartAndStopTest, ImmediateStartStopAndRestart) {
+  // GCMClientImpl should be in INITIALIZED state at first.
+  EXPECT_EQ(GCMClientImpl::INITIALIZED, gcm_client_state());
 
   // Start the GCM and then stop and restart it immediately.
   gcm_client()->Start(GCMClient::IMMEDIATE_START);
   gcm_client()->Stop();
   gcm_client()->Start(GCMClient::IMMEDIATE_START);
   PumpLoopUntilIdle();
   EXPECT_EQ(GCMClientImpl::INITIAL_DEVICE_CHECKIN, gcm_client_state());
 }
 
-TEST_F(GCMClientImplStartAndStopTest, DelayStart) {
+TEST_F(GCMClientImplStartAndStopTest, ImmediateStartAndThenImmediateStart) {
   // GCMClientImpl should be in INITIALIZED state at first.
   EXPECT_EQ(GCMClientImpl::INITIALIZED, gcm_client_state());
 
-  // Delay start the GCM.
+  // Start the GCM immediately and complete the checkin.
+  gcm_client()->Start(GCMClient::IMMEDIATE_START);
+  PumpLoopUntilIdle();
+  EXPECT_EQ(GCMClientImpl::INITIAL_DEVICE_CHECKIN, gcm_client_state());
+  DefaultCompleteCheckin();
+  EXPECT_EQ(GCMClientImpl::READY, gcm_client_state());
+
+  // Stop the GCM.
+  gcm_client()->Stop();
+  PumpLoopUntilIdle();
+  EXPECT_EQ(GCMClientImpl::INITIALIZED, gcm_client_state());
+
+  // Start the GCM immediately. GCMClientImpl should be in READY state.
+  BuildGCMClient(base::TimeDelta());
+  InitializeGCMClient();
+  gcm_client()->Start(GCMClient::IMMEDIATE_START);
+  PumpLoopUntilIdle();
+  EXPECT_EQ(GCMClientImpl::READY, gcm_client_state());
+}
+
+TEST_F(GCMClientImplStartAndStopTest, ImmediateStartAndThenDelayStart) {
+  // GCMClientImpl should be in INITIALIZED state at first.
+  EXPECT_EQ(GCMClientImpl::INITIALIZED, gcm_client_state());
+
+  // Start the GCM immediately and complete the checkin.
+  gcm_client()->Start(GCMClient::IMMEDIATE_START);
+  PumpLoopUntilIdle();
+  EXPECT_EQ(GCMClientImpl::INITIAL_DEVICE_CHECKIN, gcm_client_state());
+  DefaultCompleteCheckin();
+  EXPECT_EQ(GCMClientImpl::READY, gcm_client_state());
+
+  // Stop the GCM.
+  gcm_client()->Stop();
+  PumpLoopUntilIdle();
+  EXPECT_EQ(GCMClientImpl::INITIALIZED, gcm_client_state());
+
+  // Delay start the GCM. GCMClientImpl should be in LOADED state.
+  BuildGCMClient(base::TimeDelta());
+  InitializeGCMClient();
   gcm_client()->Start(GCMClient::DELAYED_START);
   PumpLoopUntilIdle();
   EXPECT_EQ(GCMClientImpl::LOADED, gcm_client_state());
+}
+
+TEST_F(GCMClientImplStartAndStopTest, DelayedStart) {
+  // GCMClientImpl should be in INITIALIZED state at first.
+  EXPECT_EQ(GCMClientImpl::INITIALIZED, gcm_client_state());
+
+  // Delay start the GCM. The store will not be loaded and GCMClientImpl should
+  // still be in INITIALIZED state.
+  gcm_client()->Start(GCMClient::DELAYED_START);
+  PumpLoopUntilIdle();
+  EXPECT_EQ(GCMClientImpl::INITIALIZED, gcm_client_state());
 
   // Start the GCM immediately and complete the checkin.
   gcm_client()->Start(GCMClient::IMMEDIATE_START);
   PumpLoopUntilIdle();
   EXPECT_EQ(GCMClientImpl::INITIAL_DEVICE_CHECKIN, gcm_client_state());
   DefaultCompleteCheckin();
   EXPECT_EQ(GCMClientImpl::READY, gcm_client_state());
 
   // Registration.
   std::vector<std::string> senders;
   senders.push_back("sender");
- Register(kAppId, senders);
+  Register(kAppId, senders);
   CompleteRegistration("reg_id");
   EXPECT_EQ(GCMClientImpl::READY, gcm_client_state());
 
   // Stop the GCM.
   gcm_client()->Stop();
   PumpLoopUntilIdle();
   EXPECT_EQ(GCMClientImpl::INITIALIZED, gcm_client_state());
 
   // Delay start the GCM. GCM is indeed started without delay because the
   // registration record has been found.
+  BuildGCMClient(base::TimeDelta());
+  InitializeGCMClient();
   gcm_client()->Start(GCMClient::DELAYED_START);
   PumpLoopUntilIdle();
   EXPECT_EQ(GCMClientImpl::READY, gcm_client_state());
 }
 
 // Test for known account mappings and last token fetching time being passed
 // to OnGCMReady.
 TEST_F(GCMClientImplStartAndStopTest, OnGCMReadyAccountsAndTokenFetchingTime) {
   // Start the GCM and wait until it is ready.
   gcm_client()->Start(GCMClient::IMMEDIATE_START);
@@ skipping 218 matching lines @@
 
   EXPECT_EQ(UNREGISTRATION_COMPLETED, last_event());
   EXPECT_EQ(kAppId, last_app_id());
   EXPECT_EQ(GCMClient::SUCCESS, last_result());
   // All tokens are gone now.
   EXPECT_FALSE(ExistsToken(kAppId, kSender, kScope));
   EXPECT_FALSE(ExistsToken(kAppId, kSender, kScope));
 }
 
 }  // namespace gcm