s/experimental.identity/identity

(identity is out of experimental)

BUG=

Review URL: https://chromiumcodereview.appspot.com/22339015

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

4 files changed, 6 insertions, 10 deletions

diff --git a/remoting/webapp/appsv2.patch b/remoting/webapp/appsv2.patch
index 0e643dbc..f03a317 100644
--- a/remoting/webapp/appsv2.patch
+++ b/remoting/webapp/appsv2.patch
@@ -42,8 +42,8 @@ index d1f8d1f..67bf660 100644
      "clipboardWrite",
 -    "nativeMessaging"
 +    "nativeMessaging",
-+    "experimental",
 +    "fullscreen"
++    "identity",
    ],
 -  "plugins": [
 -    { "path": "remoting_host_plugin.dll", "public": false },
diff --git a/remoting/webapp/identity.js b/remoting/webapp/identity.js
index cc832f2..e30e143 100644
--- a/remoting/webapp/identity.js
+++ b/remoting/webapp/identity.js
@@ -51,7 +51,7 @@ remoting.Identity = function(consentCallback) {
 remoting.Identity.prototype.callWithToken = function(onOk, onError) {
   this.pendingCallbacks_.push(new remoting.Identity.Callbacks(onOk, onError));
   if (this.pendingCallbacks_.length == 1) {
-    chrome.experimental.identity.getAuthToken(
+    chrome.identity.getAuthToken(
         { 'interactive': false },
         this.onAuthComplete_.bind(this, false));
   }
@@ -132,7 +132,7 @@ remoting.Identity.prototype.onAuthComplete_ = function(interactive, token) {
  * @private
  */
 remoting.Identity.prototype.onAuthContinue_ = function() {
-  chrome.experimental.identity.getAuthToken(
+  chrome.identity.getAuthToken(
       { 'interactive': true },
       this.onAuthComplete_.bind(this, true));
 };
diff --git a/remoting/webapp/jscompiler_hacks.js b/remoting/webapp/jscompiler_hacks.js
index 911d321..ad4d755 100644
--- a/remoting/webapp/jscompiler_hacks.js
+++ b/remoting/webapp/jscompiler_hacks.js
@@ -122,10 +122,7 @@ chrome.app.window = {
 };
 
 /** @type {Object} */
-chrome.experimental = {};
-
-/** @type {Object} */
-chrome.experimental.identity = {
+chrome.identity = {
   /**
    * @param {Object.<string>} parameters
    * @param {function(string):void} callback
diff --git a/remoting/webapp/third_party_token_fetcher.js b/remoting/webapp/third_party_token_fetcher.js
index ffe9120..a709159 100644
--- a/remoting/webapp/third_party_token_fetcher.js
+++ b/remoting/webapp/third_party_token_fetcher.js
@@ -44,7 +44,7 @@ remoting.ThirdPartyTokenFetcher = function(
   this.xsrfToken_ = remoting.generateXsrfToken();
   this.tokenUrlPatterns_ = tokenUrlPatterns;
   this.hostPublicKey_ = hostPublicKey;
-  if (chrome.experimental && chrome.experimental.identity) {
+  if (chrome.identity) {
     /** @type {function():void}
      * @private */
     this.fetchTokenInternal_ = this.fetchTokenIdentityApi_.bind(this);
@@ -169,8 +169,7 @@ remoting.ThirdPartyTokenFetcher.prototype.fetchTokenWindowOpen_ = function() {
  */
 remoting.ThirdPartyTokenFetcher.prototype.fetchTokenIdentityApi_ = function() {
   var fullTokenUrl = this.getFullTokenUrl_();
-  // TODO(rmsousa): chrome.identity.launchWebAuthFlow is experimental.
-  chrome.experimental.identity.launchWebAuthFlow(
+  chrome.identity.launchWebAuthFlow(
     {'url': fullTokenUrl, 'interactive': true},
     this.parseRedirectUrl_.bind(this));
 };
\ No newline at end of file