[GCM] fixing G-settings initialization from an empty store

google_apis/gcm/engine/gservices_settings_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 "base/strings/string_number_conversions.h"
 #include "google_apis/gcm/engine/gservices_settings.h"
 #include "google_apis/gcm/engine/registration_info.h"
 #include "google_apis/gcm/gcm_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gcm {
 
 namespace {
 
-const int64 kAlternativeCheckinInterval = 2000LL;
+const int64 kAlternativeCheckinInterval = 16 * 60 * 60;
 const char kAlternativeCheckinURL[] = "http://alternative.url/checkin";
 const char kAlternativeMCSHostname[] = "http://alternative.gcm.host";
 const int kAlternativeMCSSecurePort = 443;
 const char kAlternativeRegistrationURL[] =
     "http://alternative.url/registration";
 
 const int64 kDefaultCheckinInterval = 2 * 24 * 60 * 60;  // seconds = 2 days.
 const char kDefaultCheckinURL[] = "https://android.clients.google.com/checkin";
 const char kDefaultMCSHostname[] = "https://mtalk.google.com";
 const int kDefaultMCSSecurePort = 5228;
@@ skipping 144 matching lines @@
   }
 }
 
 // Verifies default values of the G-services settings and settings digest.
 TEST_F(GServicesSettingsTest, DefaultSettingsAndDigest) {
   CheckAllSetToDefault();
   EXPECT_EQ(std::string(), settings().digest());
 }
 
 // Verifies that the settings are set correctly based on the load result.
+TEST_F(GServicesSettingsTest, UpdateFromEmptyLoadResult) {
+  GCMStore::LoadResult result;
+  result.gservices_digest = "digest_value";
+  settings().UpdateFromLoadResult(result);
+
+  CheckAllSetToDefault();
+  EXPECT_EQ(std::string(), settings().digest());
+}
+
+// Verifies that the settings are set correctly based on the load result.
 TEST_F(GServicesSettingsTest, UpdateFromLoadResult) {
   GCMStore::LoadResult result;
   result.gservices_settings = alternative_settings();
   result.gservices_digest = "digest_value";
   settings().UpdateFromLoadResult(result);
 
   CheckAllSetToAlternative();
   EXPECT_EQ("digest_value", settings().digest());
 }
 
@@ skipping 35 matching lines @@
   checkin_response.set_digest("old_digest");
   SetWithAlternativeSettings(checkin_response);
   settings().UpdateFromCheckinResponse(checkin_response);
   EXPECT_FALSE(gcm_store().settings_saved());
 
   CheckAllSetToAlternative();
   EXPECT_EQ("old_digest", settings().digest());
 }
 
 }  // namespace gcm