Adding handling of MCS Endpoints to GServicesSettings

google_apis/gcm/engine/gservices_settings.h

 // 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.
 
 #ifndef GOOGLE_APIS_GCM_ENGINE_GSERVICES_SETTINGS_H_
 #define GOOGLE_APIS_GCM_ENGINE_GSERVICES_SETTINGS_H_
 
 #include <map>
 #include <string>
 
@@ skipping 29 matching lines @@
 
   // Gets the settings as a map of string to string for storing.
   std::map<std::string, std::string> GetSettingsMap() const;
 
   std::string digest() const { return digest_; }
 
   base::TimeDelta checkin_interval() const { return checkin_interval_; }
 
   GURL checkin_url() const { return checkin_url_; }
 
-  // TODO(fgorski): Consider returning GURL and use it for validation.
-  std::string mcs_hostname() const { return mcs_hostname_; }
+  GURL mcs_main_endpoint() const { return mcs_main_endpoint_; }
 
-  int mcs_secure_port() const { return mcs_secure_port_; }
+  GURL mcs_fallback_endpoint() const { return mcs_fallback_endpoint_; }
 
   GURL registration_url() const { return registration_url_; }
 
  private:
   // Parses the |settings| to fill in specific fields.
   // TODO(fgorski): Change to a status variable that can be logged to UMA.
   bool UpdateSettings(const std::map<std::string, std::string>& settings);
 
   // Digest (hash) of the settings, used to check whether settings need update.
   // It is meant to be sent with checkin request, instead of sending the whole
   // settings table.
   std::string digest_;
 
   // Time delta between periodic checkins.
   base::TimeDelta checkin_interval_;
 
   // URL that should be used for checkins.
   GURL checkin_url_;
 
-  // Hostname of the MCS server.
-  std::string mcs_hostname_;
+  // Main MCS endpoint.
+  GURL mcs_main_endpoint_;
 
-  // Secure port to connect to on MCS sever.
-  int mcs_secure_port_;
+  // Fallback MCS endpoint.
+  GURL mcs_fallback_endpoint_;
 
   // URL that should be used for regisrations and unregistrations.
   GURL registration_url_;
 
   // Factory for creating references in callbacks.
   base::WeakPtrFactory<GServicesSettings> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GServicesSettings);
 };
 
 }  // namespace gcm
 
 #endif  // GOOGLE_APIS_GCM_ENGINE_GSERVICES_SETTINGS_H_