Load webview_saml_injected from file

After we migrated c/b/resources/gaia_auth_host/ to JS modules,
webview_saml_injected.js file in saml_handler.js wasn't inlined in
"injectedJs" variable anymore.

Since "// <include ..." doesn't work for generated files,
"addContentScripts" call is updated to load the script from file
instead.

saml_handler.js is also used in OOBE and in-session password change
flow. This CL updates their webui files to include
webview_saml_injected.js.

Bug: 1160632
Change-Id: I47a5bc0b2119dd0bab9bb492ccd743ce2cd48d05
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2599861Reviewed-by: Roman Sorokin [CET] <rsorokin@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: Yusuf Sengul <yusufsn@google.com>
Commit-Queue: Anastasiia N <anastasiian@chromium.org>
Cr-Commit-Position: refs/heads/master@{#839080}

chrome/browser/browser_resources.grd

@@ -162,6 +162,7 @@
         <include name="IDR_INLINE_LOGIN_HTML" file="resources\inline_login\inline_login.html" type="BINDATA" />
         <include name="IDR_INLINE_LOGIN_APP_JS" file="${root_gen_dir}\chrome\browser\resources\inline_login\inline_login_app.js" use_base_dir="false" type ="BINDATA" preprocess="true" />
         <include name="IDR_INLINE_LOGIN_BROWSER_PROXY_JS" file="resources\inline_login\inline_login_browser_proxy.js" type ="BINDATA" preprocess="true"/>
+        <include name="IDR_GAIA_AUTH_WEBVIEW_SAML_INJECTED_JS" file="resources\gaia_auth_host\webview_saml_injected.js" flattenhtml="true" type="BINDATA" />
       </if>
 
       <if expr="chromeos">

chrome/browser/resources/gaia_auth_host/saml_handler.js

@@ -63,9 +63,7 @@ cr.define('cr.login', function() {
    * The script to inject into webview and its sub frames.
    * @type {string}
    */
-  const injectedJs = String.raw`
-      // <include src="webview_saml_injected.js">
-  `;
+  const injectedJs = 'webview_saml_injected.js';
 
   /**
    * @typedef {{
@@ -313,7 +311,7 @@ cr.define('cr.login', function() {
       this.webview_.addContentScripts([{
         name: injectedScriptName,
         matches: ['http://*/*', 'https://*/*'],
-        js: {code: injectedJs},
+        js: {files: [injectedJs]},
         all_frames: true,
         run_at: 'document_start'
       }]);

chrome/browser/ui/webui/chromeos/in_session_password_change/lock_screen_start_reauth_ui.cc

@@ -58,6 +58,8 @@ LockScreenStartReauthUI::LockScreenStartReauthUI(content::WebUI* web_ui)
   source->SetDefaultResource(IDR_LOCK_SCREEN_REAUTH_HTML);
 
   source->AddResourcePath("authenticator.js", IDR_GAIA_AUTH_AUTHENTICATOR_JS);
+  source->AddResourcePath("webview_saml_injected.js",
+                          IDR_GAIA_AUTH_WEBVIEW_SAML_INJECTED_JS);
 
   source->AddResourcePath("lock_screen_reauth.js", IDR_LOCK_SCREEN_REAUTH_JS);
 

chrome/browser/ui/webui/chromeos/in_session_password_change/password_change_ui.cc

@@ -99,6 +99,8 @@ PasswordChangeUI::PasswordChangeUI(content::WebUI* web_ui)
   source->AddResourcePath("password_change.css", IDR_PASSWORD_CHANGE_CSS);
   source->AddResourcePath("authenticator.js",
                           IDR_PASSWORD_CHANGE_AUTHENTICATOR_JS);
+  source->AddResourcePath("webview_saml_injected.js",
+                          IDR_GAIA_AUTH_WEBVIEW_SAML_INJECTED_JS);
   source->AddResourcePath("password_change.js", IDR_PASSWORD_CHANGE_JS);
 
   content::WebUIDataSource::Add(profile, source);

chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

@@ -150,6 +150,7 @@ constexpr char kProductLogoPath[] = "product-logo.png";
 constexpr char kRecommendAppListViewHTMLPath[] = "recommend_app_list_view.html";
 constexpr char kRecommendAppListViewJSPath[] = "recommend_app_list_view.js";
 constexpr char kTestAPIJSPath[] = "test_api.js";
+constexpr char kWebviewSamlInjectedJSPath[] = "webview_saml_injected.js";
 
 // Components
 constexpr char kCommonStylesHTML[] = "components/common_styles.html";
@@ -367,6 +368,8 @@ content::WebUIDataSource* CreateOobeUIDataSource(
   AddDebuggerResources(source);
   AddTestAPIResources(source);
 
+  source->AddResourcePath(kWebviewSamlInjectedJSPath,
+                          IDR_GAIA_AUTH_WEBVIEW_SAML_INJECTED_JS);
   source->AddResourcePath(kKeyboardUtilsJSPath, IDR_KEYBOARD_UTILS_JS);
   source->OverrideContentSecurityPolicy(
       network::mojom::CSPDirectiveName::ObjectSrc, "object-src chrome:;");

chrome/browser/ui/webui/signin/inline_login_ui.cc

@@ -128,6 +128,7 @@ content::WebUIDataSource* CreateWebUIDataSource(Profile* profile) {
   static constexpr webui::ResourcePath kResources[] = {
     {"inline_login_app.js", IDR_INLINE_LOGIN_APP_JS},
     {"inline_login_browser_proxy.js", IDR_INLINE_LOGIN_BROWSER_PROXY_JS},
+    {"webview_saml_injected.js", IDR_GAIA_AUTH_WEBVIEW_SAML_INJECTED_JS},
 #if BUILDFLAG(IS_CHROMEOS_ASH)
     {"welcome_page_app.js", IDR_INLINE_LOGIN_WELCOME_PAGE_APP_JS},
     {"account_manager_shared_css.js", IDR_ACCOUNT_MANAGER_SHARED_CSS_JS},