Adding handling of MCS Endpoints to GServicesSettings

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 = 16 * 60 * 60;
 const char kAlternativeCheckinURL[] = "http://alternative.url/checkin";
-const char kAlternativeMCSHostname[] = "http://alternative.gcm.host";
-const int kAlternativeMCSSecurePort = 443;
+const char kAlternativeMCSHostname[] = "alternative.gcm.host";
+const int kAlternativeMCSSecurePort = 7777;
 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;
 const char kDefaultRegistrationURL[] =
     "https://android.clients.google.com/c2dm/register3";
 
 }  // namespace
 
 class GServicesSettingsTest : public testing::Test {
  public:
   GServicesSettingsTest();
   virtual ~GServicesSettingsTest();
 
@@ skipping 31 matching lines @@
   alternative_settings_["gcm_hostname"] = kAlternativeMCSHostname;
   alternative_settings_["gcm_secure_port"] =
       base::IntToString(kAlternativeMCSSecurePort);
   alternative_settings_["gcm_registration_url"] = kAlternativeRegistrationURL;
 }
 
 void GServicesSettingsTest::CheckAllSetToDefault() {
   EXPECT_EQ(base::TimeDelta::FromSeconds(kDefaultCheckinInterval),
             settings().checkin_interval());
   EXPECT_EQ(GURL(kDefaultCheckinURL), settings().checkin_url());
-  EXPECT_EQ(kDefaultMCSHostname, settings().mcs_hostname());
-  EXPECT_EQ(kDefaultMCSSecurePort, settings().mcs_secure_port());
+  EXPECT_EQ(GURL("https://mtalk.google.com:5228"),
+                 settings().mcs_main_endpoint());
+  EXPECT_EQ(GURL("https://mtalk.google.com:443"),
+                 settings().mcs_fallback_endpoint());
   EXPECT_EQ(GURL(kDefaultRegistrationURL), settings().registration_url());
 }
 
 void GServicesSettingsTest::CheckAllSetToAlternative() {
   EXPECT_EQ(base::TimeDelta::FromSeconds(kAlternativeCheckinInterval),
             settings().checkin_interval());
   EXPECT_EQ(GURL(kAlternativeCheckinURL), settings().checkin_url());
-  EXPECT_EQ(kAlternativeMCSHostname, settings().mcs_hostname());
-  EXPECT_EQ(kAlternativeMCSSecurePort, settings().mcs_secure_port());
+  EXPECT_EQ(GURL("https://alternative.gcm.host:7777"),
+                 settings().mcs_main_endpoint());
+  EXPECT_EQ(GURL("https://alternative.gcm.host:443"),
+                 settings().mcs_fallback_endpoint());
   EXPECT_EQ(GURL(kAlternativeRegistrationURL), settings().registration_url());
 }
 
 void GServicesSettingsTest::SetWithAlternativeSettings(
     checkin_proto::AndroidCheckinResponse& checkin_response) {
   for (std::map<std::string, std::string>::const_iterator iter =
            alternative_settings_.begin();
        iter != alternative_settings_.end(); ++iter) {
     checkin_proto::GservicesSetting* setting = checkin_response.add_setting();
     setting->set_name(iter->first);
@@ skipping 107 matching lines @@
   checkin_proto::AndroidCheckinResponse checkin_response;
   checkin_response.set_digest("old_digest");
   SetWithAlternativeSettings(checkin_response);
   EXPECT_FALSE(settings().UpdateFromCheckinResponse(checkin_response));
 
   CheckAllSetToAlternative();
   EXPECT_EQ("old_digest", settings().digest());
 }
 
 }  // namespace gcm