Added GCD-related information to ServiceUrls.

BUG=471928

Review URL: https://codereview.chromium.org/1128753002

Cr-Commit-Position: refs/heads/master@{#328867}

2 files changed, 27 insertions, 1 deletions

diff --git a/remoting/base/service_urls.cc b/remoting/base/service_urls.cc
index 2d6403b..bd3485c 100644
--- a/remoting/base/service_urls.cc
+++ b/remoting/base/service_urls.cc
@@ -9,17 +9,21 @@
 
 // Configurable service data.
 const char kDirectoryBaseUrl[] = "https://www.googleapis.com/chromoting/v1";
+const char kGcdBaseUrl[] = "https://www.googleapis.com/clouddevices/v1";
 const char kXmppServerAddress[] = "talk.google.com:443";
 const char kXmppServerAddressForMe2MeHost[] = "talk.google.com:5222";
 const bool kXmppServerUseTls = true;
 const char kDirectoryBotJid[] = "remoting@bot.talk.google.com";
+const char kGcdJid[] = "clouddevices.gserviceaccount.com";
 
 // Command line switches.
 #if !defined(NDEBUG)
 const char kDirectoryBaseUrlSwitch[] = "directory-base-url";
+const char kGcdBaseUrlSwitch[] = "gcd-base-url";
 const char kXmppServerAddressSwitch[] = "xmpp-server-address";
 const char kXmppServerDisableTlsSwitch[] = "disable-xmpp-server-tls";
 const char kDirectoryBotJidSwitch[] = "directory-bot-jid";
+const char kGcdJidSwitch[] = "gcd-jid";
 #endif  // !defined(NDEBUG)
 
 // Non-configurable service paths.
@@ -29,10 +33,12 @@ namespace remoting {
 
 ServiceUrls::ServiceUrls()
     : directory_base_url_(kDirectoryBaseUrl),
+      gcd_base_url_(kGcdBaseUrl),
       xmpp_server_address_(kXmppServerAddress),
       xmpp_server_address_for_me2me_host_(kXmppServerAddressForMe2MeHost),
       xmpp_server_use_tls_(kXmppServerUseTls),
-      directory_bot_jid_(kDirectoryBotJid) {
+      directory_bot_jid_(kDirectoryBotJid),
+      gcd_jid_(kGcdJid) {
 #if !defined(NDEBUG)
   // Allow debug builds to override urls via command line.
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
@@ -41,6 +47,9 @@ ServiceUrls::ServiceUrls()
     directory_base_url_ = command_line->GetSwitchValueASCII(
         kDirectoryBaseUrlSwitch);
   }
+  if (command_line->HasSwitch(kGcdBaseUrlSwitch)) {
+    gcd_base_url_ = command_line->GetSwitchValueASCII(kGcdBaseUrlSwitch);
+  }
   if (command_line->HasSwitch(kXmppServerAddressSwitch)) {
     xmpp_server_address_ = command_line->GetSwitchValueASCII(
         kXmppServerAddressSwitch);
@@ -53,6 +62,9 @@ ServiceUrls::ServiceUrls()
     directory_bot_jid_ = command_line->GetSwitchValueASCII(
         kDirectoryBotJidSwitch);
   }
+  if (command_line->HasSwitch(kGcdJidSwitch)) {
+    gcd_jid_ = command_line->GetSwitchValueASCII(kGcdJidSwitch);
+  }
 #endif  // !defined(NDEBUG)
 
   directory_hosts_url_ = directory_base_url_ + kDirectoryHostsSuffix;
@@ -73,6 +85,10 @@ const std::string& ServiceUrls::directory_hosts_url() const {
   return directory_hosts_url_;
 }
 
+const std::string& ServiceUrls::gcd_base_url() const {
+  return gcd_base_url_;
+}
+
 const std::string& ServiceUrls::xmpp_server_address() const {
   return xmpp_server_address_;
 }
@@ -89,4 +105,8 @@ const std::string& ServiceUrls::directory_bot_jid() const {
   return directory_bot_jid_;
 }
 
+const std::string& ServiceUrls::gcd_jid() const {
+  return directory_bot_jid_;
+}
+
 }  // namespace remoting
diff --git a/remoting/base/service_urls.h b/remoting/base/service_urls.h
index 6e03e37..6d1b625 100644
--- a/remoting/base/service_urls.h
+++ b/remoting/base/service_urls.h
@@ -23,6 +23,7 @@ class ServiceUrls {
   // Remoting directory REST API URLs.
   const std::string& directory_base_url() const;
   const std::string& directory_hosts_url() const;
+  const std::string& gcd_base_url() const;
 
   // XMPP Server configuration.
   const std::string& xmpp_server_address() const;
@@ -32,6 +33,9 @@ class ServiceUrls {
   // Remoting directory bot JID (for registering hosts, logging, heartbeats).
   const std::string& directory_bot_jid() const;
 
+  // JID for communicating with GCD.
+  const std::string& gcd_jid() const;
+
  private:
   friend struct DefaultSingletonTraits<ServiceUrls>;
 
@@ -40,10 +44,12 @@ class ServiceUrls {
 
   std::string directory_base_url_;
   std::string directory_hosts_url_;
+  std::string gcd_base_url_;
   std::string xmpp_server_address_;
   std::string xmpp_server_address_for_me2me_host_;
   bool xmpp_server_use_tls_;
   std::string directory_bot_jid_;
+  std::string gcd_jid_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceUrls);
 };