cros: Use webview.addContentScripts for new Gaia SAML.

chrome/browser/chromeos/login/saml/saml_browsertest.cc

 // Copyright 2014 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 <cstring>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 249 matching lines @@
 
   return http_response.Pass();
 }
 
 }  // namespace
 
 // Boolean parameter is used to run this test for webview (true) and for
 // iframe (false) GAIA sign in.
 class SamlTest : public OobeBaseTest, public testing::WithParamInterface<bool> {
  public:
-  SamlTest() : saml_load_injected_(false) {
+  SamlTest() {
     set_use_webview(GetParam());
     set_initialize_fake_merge_session(false);
   }
   ~SamlTest() override {}
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitch(switches::kOobeSkipPostLogin);
 
     const GURL gaia_url = gaia_https_forwarder_.GetURLForSSLHost("");
     const GURL saml_idp_url = saml_https_forwarder_.GetURLForSSLHost("SAML");
@@ skipping 11 matching lines @@
   void SetUpOnMainThread() override {
     fake_gaia_->SetFakeMergeSessionParams(
         kFirstSAMLUserEmail, kTestAuthSIDCookie1, kTestAuthLSIDCookie1);
 
     embedded_test_server()->RegisterRequestHandler(base::Bind(
         &FakeSamlIdp::HandleRequest, base::Unretained(&fake_saml_idp_)));
 
     OobeBaseTest::SetUpOnMainThread();
   }
 
+  void SetupAuthFlowChangeListener() {
+    ASSERT_TRUE(content::ExecuteScript(
+        GetLoginUI()->GetWebContents(),
+        "$('gaia-signin').gaiaAuthHost_.addEventListener('authFlowChange',"
+            "function f() {"
+              "$('gaia-signin').gaiaAuthHost_.removeEventListener("
+                  "'authFlowChange', f);"
+              "window.domAutomationController.setAutomationId(0);"
+              "window.domAutomationController.send("
+                  "$('gaia-signin').isSAML() ? 'SamlLoaded' : 'GaiaLoaded');"
+            "});"));
+  }
+
   virtual void StartSamlAndWaitForIdpPageLoad(const std::string& gaia_email) {
     WaitForSigninScreen();
 
-    if (!saml_load_injected_) {
-      saml_load_injected_ = true;
-
-      ASSERT_TRUE(content::ExecuteScript(
-          GetLoginUI()->GetWebContents(),
-          "$('gaia-signin').gaiaAuthHost_.addEventListener('authFlowChange',"
-              "function() {"
-                "window.domAutomationController.setAutomationId(0);"
-                "window.domAutomationController.send("
-                    "$('gaia-signin').isSAML() ? 'SamlLoaded' : 'GaiaLoaded');"
-              "});"));
-    }
+    SetupAuthFlowChangeListener();
 
     content::DOMMessageQueue message_queue;  // Start observe before SAML.
     GetLoginDisplay()->ShowSigninScreenForCreds(gaia_email, "");
 
     std::string message;
     ASSERT_TRUE(message_queue.WaitForMessage(&message));
     EXPECT_EQ("\"SamlLoaded\"", message);
   }
 
   void SendConfirmPassword(const std::string& password_to_confirm) {
@@ skipping 24 matching lines @@
     ASSERT_TRUE(saml_https_forwarder_.Initialize(
         kIdPHost, embedded_test_server()->base_url()));
     OobeBaseTest::InitHttpsForwarders();
   }
 
   HTTPSForwarder saml_https_forwarder_;
 
  private:
   FakeSamlIdp fake_saml_idp_;
 
-  bool saml_load_injected_;
-
   DISALLOW_COPY_AND_ASSIGN(SamlTest);
 };
 
 // Tests that signin frame should have 'saml' class and 'cancel' button is
 // visible when SAML IdP page is loaded. And 'cancel' button goes back to
 // gaia on clicking.
 IN_PROC_BROWSER_TEST_P(SamlTest, SamlUI) {
   fake_saml_idp()->SetLoginHTMLTemplate("saml_login.html");
   StartSamlAndWaitForIdpPageLoad(kFirstSAMLUserEmail);
 
   // Saml flow UI expectations.
   JsExpect("$('gaia-signin').classList.contains('full-width')");
   JsExpect("!$('saml-notice-container').hidden");
   std::string js = "$('saml-notice-message').textContent.indexOf('$Host') > -1";
   ReplaceSubstringsAfterOffset(&js, 0, "$Host", kIdPHost);
   JsExpect(js);
   if (!use_webview()) {
     JsExpect("!$('cancel-add-user-button').hidden");
   }
 
+  SetupAuthFlowChangeListener();
+
   // Click on 'cancel'.
   content::DOMMessageQueue message_queue;  // Observe before 'cancel'.
   if (use_webview()) {
     ASSERT_TRUE(content::ExecuteScript(
         GetLoginUI()->GetWebContents(),
         "$('close-button-item').click();"));
   } else {
     ASSERT_TRUE(content::ExecuteScript(
         GetLoginUI()->GetWebContents(),
         "$('cancel-add-user-button').click();"));
   }
 
   // Auth flow should change back to Gaia.
   std::string message;
   do {
     ASSERT_TRUE(message_queue.WaitForMessage(&message));
   } while (message != "\"GaiaLoaded\"");
 
   // Saml flow is gone.
   JsExpect("!$('gaia-signin').classList.contains('full-width')");
 }
 
 // Tests the sign-in flow when the credentials passing API is used.
 IN_PROC_BROWSER_TEST_P(SamlTest, CredentialPassingAPI) {
-  // Disabled for webview because the script is injected using
-  // webview.executeScript and there is no way to control the injection time.
-  // As a result, this test is flaky and fails about 20% of the time.
-  // TODO(xiyuan): Re-enable when webview.addContentScript API is ready.
-  if (use_webview())
-    return;
-
   fake_saml_idp()->SetLoginHTMLTemplate("saml_api_login.html");
   fake_saml_idp()->SetLoginAuthHTMLTemplate("saml_api_login_auth.html");
   StartSamlAndWaitForIdpPageLoad(kFirstSAMLUserEmail);
 
   content::WindowedNotificationObserver session_start_waiter(
       chrome::NOTIFICATION_SESSION_STARTED,
       content::NotificationService::AllSources());
 
   // Fill-in the SAML IdP form and submit.
   SetSignFormField("Email", "fake_user");
@@ skipping 747 matching lines @@
   EXPECT_EQ(kTestAuthSIDCookie1, GetCookieValue(kGAIASIDCookieName));
   EXPECT_EQ(kTestAuthLSIDCookie1, GetCookieValue(kGAIALSIDCookieName));
   EXPECT_EQ(kSAMLIdPCookieValue1, GetCookieValue(kSAMLIdPCookieName));
 }
 
 INSTANTIATE_TEST_CASE_P(SamlSuite,
                         SAMLPolicyTest,
                         testing::Bool());
 
 }  // namespace chromeos