Change userinfo endpoint to the JSON one.

remoting/webapp/oauth2.js

 // Copyright (c) 2012 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.
 
 /**
  * @fileoverview
  * OAuth2 class that handles retrieval/storage of an OAuth2 token.
  *
  * Uses a content script to trampoline the OAuth redirect page back into the
  * extension context.  This works around the lack of native support for
@@ skipping 474 matching lines @@
   if (typeof cached == 'string') {
     onOk(cached);
     return;
   }
   /** @type {remoting.OAuth2} */
   var that = this;
   /** @param {XMLHttpRequest} xhr The XHR response. */
   var onResponse = function(xhr) {
     var email = null;
     if (xhr.status == 200) {
-      // TODO(ajwong): See if we can't find a JSON endpoint.
-      email = xhr.responseText.split('&')[0].split('=')[1];
-      window.localStorage.setItem(that.KEY_EMAIL_, email);
-      onOk(email);
-      return;
+      var result = jsonParseSafe(xhr.responseText);
+      if (result && 'email' in result) {
+        window.localStorage.setItem(that.KEY_EMAIL_, result['email']);
+        onOk(result['email']);
+        return;
+      } else {
+        console.error(
+            'Cannot parse userinfo response: ', xhr.responseText, xhr);
+        onError(remoting.Error.UNEXPECTED);
+        return;
+      }
     }
     console.error('Unable to get email address:', xhr.status, xhr);
     if (xhr.status == 401) {
       onError(remoting.Error.AUTHENTICATION_FAILED);
     } else {
       onError(that.interpretUnexpectedXhrStatus_(xhr.status));
     }
   };
 
   /** @param {string} token The access token. */
   var getEmailFromToken = function(token) {
     var headers = { 'Authorization': 'OAuth ' + token };
-    // TODO(ajwong): Update to new v2 API.
-    remoting.xhr.get('https://www.googleapis.com/userinfo/email',
+    remoting.xhr.get('https://www.googleapis.com/oauth2/v1/userinfo',
                      onResponse, '', headers);
   };
 
   this.callWithToken(getEmailFromToken, onError);
 };
 
 /**
  * If the user's email address is cached, return it, otherwise return null.
  *
  * @return {?string} The email address, if it has been cached by a previous call
  *     to getEmail, otherwise null.
  */
 remoting.OAuth2.prototype.getCachedEmail = function() {
   var value = window.localStorage.getItem(this.KEY_EMAIL_);
   if (typeof value == 'string') {
     return value;
   }
   return null;
 };