Updated chromoting directory URL to use www.googleapis.com, switched to https.

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/3252006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57909 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 15 insertions, 11 deletions

diff --git a/chrome/service/remoting/remoting_directory_service.cc b/chrome/service/remoting/remoting_directory_service.cc
index 8bc6b0a0..fbe00206 100644
--- a/chrome/service/remoting/remoting_directory_service.cc
+++ b/chrome/service/remoting/remoting_directory_service.cc
@@ -15,7 +15,7 @@
 #include "remoting/host/host_key_pair.h"
 
 static const char kRemotingDirectoryUrl[] =
-    "http://www-googleapis-test.sandbox.google.com/chromoting/v1/@me/hosts";
+    "https://www.googleapis.com/chromoting/v1/@me/hosts";
 
 RemotingDirectoryService::RemotingDirectoryService(Client* client)
     : client_(client) {
diff --git a/remoting/client/extension/client.js b/remoting/client/extension/client.js
index cdedfe3f..dd53cf3 100644
--- a/remoting/client/extension/client.js
+++ b/remoting/client/extension/client.js
@@ -9,7 +9,8 @@ function initParams() {
 
   // Prepopulate via cookies first.
   document.getElementById('xmpp_auth').value = getCookie('xmpp_auth');
-  document.getElementById('chromoting_auth').value = getCookie('chromoting_auth');
+  document.getElementById('chromoting_auth').value =
+      getCookie('chromoting_auth');
   document.getElementById('username').value = getCookie('username');
 
   for(var i = 0; i < hashes.length; i++)
@@ -77,7 +78,8 @@ function doGaiaLogin(username, password, service, done) {
   };
 
   xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
-  xhr.send('accountType=HOSTED_OR_GOOGLE&Email=' + username + '&Passwd=' + password + '&service=' + service + '&source=chromoclient');
+  xhr.send('accountType=HOSTED_OR_GOOGLE&Email=' + username + '&Passwd=' +
+           password + '&service=' + service + '&source=chromoclient');
 }
 
 function doLogin(username, password, done) {
@@ -125,20 +127,22 @@ function doListHosts() {
       hostlist_div.appendChild(document.createElement('br'));
       appendHostLinks(parsed_response.data.items);
     } else {
-      console.log('bad status on host list query: "' + xhr.status + ' ' + xhr.statusText);
+      console.log('bad status on host list query: "' + xhr.status + ' ' +
+                  xhr.statusText);
       hostlist_div.appendChild(document.createTextNode('!! Failed !!.  :\'('));
     }
   };
 
-  xhr.open('GET', 'http://www-googleapis-test.sandbox.google.com/chromoting/v1/@me/hosts');
+  xhr.open('GET', 'https://www.googleapis.com/chromoting/v1/@me/hosts');
   xhr.setRequestHeader('Content-Type', 'text/plain;charset=UTF-8');
   xhr.setRequestHeader('Authorization', 'GoogleLogin auth=' + token);
   xhr.send(null);
 }
 
 function appendHostLinks(hostlist) {
-// A host link entry should look like:
-// - Host: <a onclick="openChromotingTab(host_jid); return false;">NAME (JID)</a> <br />
+  // A host link entry should look like:
+  //   - Host: <a onclick="openChromotingTab(host_jid); return false;">
+  //   NAME (JID) </a> <br />
   var host;
   var host_link;
   var hostlist_div = document.getElementById('hostlist_div');
diff --git a/remoting/tools/hostdir.py b/remoting/tools/hostdir.py
index d4905f4..d8ef5cd 100755
--- a/remoting/tools/hostdir.py
+++ b/remoting/tools/hostdir.py
@@ -16,7 +16,7 @@ import urllib2
 import random
 import sys
 
-DEFAULT_DIRECTORY_SERVER = 'www-googleapis-test.sandbox.google.com'
+DEFAULT_DIRECTORY_SERVER = 'www.googleapis.com'
 
 auth_filepath = os.path.join(os.path.expanduser('~'),
                              '.chromotingDirectoryAuthToken')
@@ -58,7 +58,7 @@ class HostDirectory:
     self._auth_token = auth_token
     self._base_url = '/chromoting/v1/@me/hosts'
 
-    self._http = httplib.HTTPConnection(server)
+    self._http = httplib.HTTPSConnection(server)
     self._headers = {"Authorization": "GoogleLogin auth=" + self._auth_token,
                      "Content-Type": "application/json" }
 
diff --git a/remoting/tools/register_host.py b/remoting/tools/register_host.py
index ccfe378..ffdb955 100755
--- a/remoting/tools/register_host.py
+++ b/remoting/tools/register_host.py
@@ -22,8 +22,8 @@ def random_uuid():
   return ("%04x%04x-%04x-%04x-%04x-%04x%04x%04x" %
     tuple(map(lambda x: random.randrange(0,65536), range(8))))
 
-server = 'www-googleapis-test.sandbox.google.com'
-url = 'http://' + server + '/chromoting/v1/@me/hosts'
+server = 'www.googleapis.com'
+url = 'https://' + server + '/chromoting/v1/@me/hosts'
 
 settings_filepath = os.path.join(os.path.expanduser('~'),
                                  '.ChromotingConfig.json')