cros: Use webview.addContentScripts for new Gaia SAML.

chrome/browser/resources/gaia_auth_host/saml_handler.js

 // Copyright 2015 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 src="post_message_channel.js">
 
 /**
  * @fileoverview Saml support for webview based auth.
  */
 
@@ skipping 139 matching lines @@
 
     this.webview_.request.onBeforeRequest.addListener(
         this.onInsecureRequest.bind(this),
         {urls: ['http://*/*', 'file://*/*', 'ftp://*/*']},
         ['blocking']);
     this.webview_.request.onHeadersReceived.addListener(
         this.onHeadersReceived_.bind(this),
         {urls: ['<all_urls>'], types: ['main_frame', 'xmlhttprequest']},
         ['blocking', 'responseHeaders']);
 
+    this.webview_.addContentScripts([{
+      'name': 'samlInjected',
+      'matches': ['http://*/*', 'https://*/*'],
+      'code': injectedJs,
+      'all_frames': true,
+      'run_at': 'document_start'
+    }]);
+
     PostMessageChannel.runAsDaemon(this.onConnected_.bind(this));
   }
 
   SamlHandler.prototype = {
     __proto__: cr.EventTarget.prototype,
 
     /**
      * Whether Saml API is used during auth.
      * @return {boolean}
      */
@@ skipping 46 matching lines @@
 
     /**
      * Check whether the given |password| is in the scraped passwords.
      * @return {boolean} True if the |password| is found.
      */
     verifyConfirmedPassword: function(password) {
       return this.getConsolidatedScrapedPasswords_().indexOf(password) >= 0;
     },
 
     /**
-     * Injects JS code to all frames.
-     * @private
-     */
-    injectJs_: function() {
-      if (!injectedJs)
-        return;
-
-      // TODO(xiyuan): Replace this with webview.addContentScript.
-      this.webview_.executeScript({
-        code: injectedJs,
-        allFrames: true,
-        runAt: 'document_start'
-      });
-    },
-
-    /**
      * Invoked on the webview's contentload event.
      * @private
      */
     onContentLoad_: function(e) {
       PostMessageChannel.init(this.webview_.contentWindow);
     },
 
     /**
      * Invoked on the webview's loadabort event.
      * @private
@@ skipping 14 matching lines @@
         return;
       }
 
       // Skip for none http/https url.
       if (e.url.indexOf('https://') != 0 &&
           e.url.indexOf('http://') != 0) {
         return;
       }
 
       this.isSamlPage_ = this.pendingIsSamlPage_;
-      this.injectJs_();
     },
 
     /**
      * Handler for webRequest.onBeforeRequest, invoked when content served over
      * an unencrypted connection is detected. Determines whether the request
      * should be blocked and if so, signals that an error message needs to be
      * shown.
      * @param {Object} details
      * @return {!Object} Decision whether to block the request.
      */
@@ skipping 160 matching lines @@
           {detail: {url: url,
                     isSAMLPage: this.isSamlPage_,
                     domain: this.authDomain}}));
     },
 
     onGetSAMLFlag_: function(channel, msg) {
       return this.isSamlPage_;
     },
   };
 
-  /**
-   * Sets the saml injected JS code.
-   * @param {string} samlInjectedJs JS code to inejct for Saml.
-   */
-  SamlHandler.setSamlInjectedJs = function(samlInjectedJs) {
-    injectedJs = samlInjectedJs;
-  };
-
   return {
     SamlHandler: SamlHandler
   };
 });