Add command line overrides for GCM checkin URL & MCS endpoint

google_apis/gcm/engine/gservices_settings.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 "google_apis/gcm/engine/gservices_settings.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/sha1.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 160 matching lines @@
 }  // namespace
 
 namespace gcm {
 
 // static
 const base::TimeDelta GServicesSettings::MinimumCheckinInterval() {
   return base::TimeDelta::FromSeconds(kMinimumCheckinInterval);
 }
 
 // static
-const GURL GServicesSettings::DefaultCheckinURL() {
-  return GURL(kDefaultCheckinURL);
-}
-
-// static
 std::string GServicesSettings::CalculateDigest(const SettingsMap& settings) {
   unsigned char hash[base::kSHA1Length];
   std::string data;
   for (SettingsMap::const_iterator iter = settings.begin();
        iter != settings.end();
        ++iter) {
     data += iter->first;
     data += '\0';
     data += iter->second;
     data += '\0';
@@ skipping 80 matching lines @@
     checkin_interval = kDefaultCheckinInterval;
   }
 
   if (checkin_interval < kMinimumCheckinInterval)
     checkin_interval = kMinimumCheckinInterval;
 
   return base::TimeDelta::FromSeconds(checkin_interval);
 }
 
 GURL GServicesSettings::GetCheckinURL() const {
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(switches::kGCMCheckinURL))
+    return GURL(command_line->GetSwitchValueASCII(switches::kGCMCheckinURL));
+
   SettingsMap::const_iterator iter = settings_.find(kCheckinURLKey);
   if (iter == settings_.end() || iter->second.empty())
     return GURL(kDefaultCheckinURL);
   return GURL(iter->second);
 }
 
 GURL GServicesSettings::GetMCSMainEndpoint() const {
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(switches::kGCMMCSEndpoint))
+    return GURL(command_line->GetSwitchValueASCII(switches::kGCMMCSEndpoint));
+
   // Get alternative hostname or use default.
   std::string mcs_hostname;
   SettingsMap::const_iterator iter = settings_.find(kMCSHostnameKey);
   if (iter != settings_.end() && !iter->second.empty())
     mcs_hostname = iter->second;
   else
     mcs_hostname = kDefaultMCSHostname;
 
   // Get alternative secure port or use defualt.
   int mcs_secure_port = 0;
   iter = settings_.find(kMCSSecurePortKey);
   if (iter == settings_.end() || iter->second.empty() ||
       !base::StringToInt(iter->second, &mcs_secure_port)) {
     mcs_secure_port = kDefaultMCSMainSecurePort;
   }
 
   // If constructed address makes sense use it.
   GURL mcs_endpoint(MakeMCSEndpoint(mcs_hostname, mcs_secure_port));
   if (mcs_endpoint.is_valid())
     return mcs_endpoint;
 
   // Otherwise use default settings.
   return GURL(MakeMCSEndpoint(kDefaultMCSHostname, kDefaultMCSMainSecurePort));
 }
 
 GURL GServicesSettings::GetMCSFallbackEndpoint() const {
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(switches::kGCMMCSEndpoint))
+    return GURL();  // No fallback endpoint when using command line override.
+
   // Get alternative hostname or use default.
   std::string mcs_hostname;
   SettingsMap::const_iterator iter = settings_.find(kMCSHostnameKey);
   if (iter != settings_.end() && !iter->second.empty())
     mcs_hostname = iter->second;
   else
     mcs_hostname = kDefaultMCSHostname;
 
   // If constructed address makes sense use it.
   GURL mcs_endpoint(
       MakeMCSEndpoint(mcs_hostname, kDefaultMCSFallbackSecurePort));
   if (mcs_endpoint.is_valid())
     return mcs_endpoint;
 
   return GURL(
       MakeMCSEndpoint(kDefaultMCSHostname, kDefaultMCSFallbackSecurePort));
 }
 
 GURL GServicesSettings::GetRegistrationURL() const {
-  SettingsMap::const_iterator iter = settings_.find(kRegistrationURLKey);
-  if (iter == settings_.end() || iter->second.empty()) {
-    base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-    if (!command_line->HasSwitch(switches::kGCMRegistrationURL))
-      return GURL(kDefaultRegistrationURL);
-
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(switches::kGCMRegistrationURL)) {
     return GURL(
         command_line->GetSwitchValueASCII(switches::kGCMRegistrationURL));
   }
+
+  SettingsMap::const_iterator iter = settings_.find(kRegistrationURLKey);
+  if (iter == settings_.end() || iter->second.empty())
+    return GURL(kDefaultRegistrationURL);
   return GURL(iter->second);
 }
 
 }  // namespace gcm