Adding handling of MCS Endpoints to GServicesSettings

google_apis/gcm/gcm_client_impl_unittest.cc

Index: google_apis/gcm/gcm_client_impl_unittest.cc
diff --git a/google_apis/gcm/gcm_client_impl_unittest.cc b/google_apis/gcm/gcm_client_impl_unittest.cc
index ba49590ba3686e225791047843beb26a0d14233c..c0b4d0430b3837452dbce4c3be128996fb0f24a9 100644
--- a/google_apis/gcm/gcm_client_impl_unittest.cc
+++ b/google_apis/gcm/gcm_client_impl_unittest.cc
@@ -718,8 +718,8 @@ 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"] = "http://alternative.gcm.host";
-  settings["gcm_secure_port"] = "443";
+  settings["gcm_hostname"] = "alternative.gcm.host";
+  settings["gcm_secure_port"] = "7777";
   settings["gcm_registration_url"] = "http://alternative.url/registration";
   CompleteCheckin(
       kDeviceAndroidId, kDeviceSecurityToken, kSettingsDefaultDigest, settings);
@@ -729,8 +729,10 @@ TEST_F(GCMClientImplCheckinTest, GServicesSettingsAfterInitialCheckin) {
             gservices_settings().checkin_url());
   EXPECT_EQ(GURL("http://alternative.url/registration"),
             gservices_settings().registration_url());
-  EXPECT_EQ("http://alternative.gcm.host", gservices_settings().mcs_hostname());
-  EXPECT_EQ(443, gservices_settings().mcs_secure_port());
+  EXPECT_EQ(GURL("https://alternative.gcm.host:7777"),
+            gservices_settings().mcs_main_endpoint());
+  EXPECT_EQ(GURL("https://alternative.gcm.host:443"),
+            gservices_settings().mcs_fallback_endpoint());
 }
 
 // This test only checks that periodic checkin happens.
@@ -738,8 +740,8 @@ TEST_F(GCMClientImplCheckinTest, PeriodicCheckin) {
   std::map<std::string, std::string> settings;
   settings["checkin_interval"] = base::IntToString(kSettingsCheckinInterval);
   settings["checkin_url"] = "http://alternative.url/checkin";
-  settings["gcm_hostname"] = "http://alternative.gcm.host";
-  settings["gcm_secure_port"] = "443";
+  settings["gcm_hostname"] = "alternative.gcm.host";
+  settings["gcm_secure_port"] = "7777";
   settings["gcm_registration_url"] = "http://alternative.url/registration";
   CompleteCheckin(
       kDeviceAndroidId, kDeviceSecurityToken, kSettingsDefaultDigest, settings);
@@ -754,8 +756,8 @@ TEST_F(GCMClientImplCheckinTest, LoadGSettingsFromStore) {
   std::map<std::string, std::string> settings;
   settings["checkin_interval"] = base::IntToString(kSettingsCheckinInterval);
   settings["checkin_url"] = "http://alternative.url/checkin";
-  settings["gcm_hostname"] = "http://alternative.gcm.host";
-  settings["gcm_secure_port"] = "443";
+  settings["gcm_hostname"] = "alternative.gcm.host";
+  settings["gcm_secure_port"] = "7777";
   settings["gcm_registration_url"] = "http://alternative.url/registration";
   CompleteCheckin(
       kDeviceAndroidId, kDeviceSecurityToken, kSettingsDefaultDigest, settings);
@@ -769,8 +771,10 @@ TEST_F(GCMClientImplCheckinTest, LoadGSettingsFromStore) {
             gservices_settings().checkin_url());
   EXPECT_EQ(GURL("http://alternative.url/registration"),
             gservices_settings().registration_url());
-  EXPECT_EQ("http://alternative.gcm.host", gservices_settings().mcs_hostname());
-  EXPECT_EQ(443, gservices_settings().mcs_secure_port());
+  EXPECT_EQ(GURL("https://alternative.gcm.host:7777"),
+            gservices_settings().mcs_main_endpoint());
+  EXPECT_EQ(GURL("https://alternative.gcm.host:443"),
+            gservices_settings().mcs_fallback_endpoint());
 }
 
 }  // namespace gcm