Revert "Speculative revert by sheriff"

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 152 matching lines @@
 }
 
 FakeSamlIdp::~FakeSamlIdp() {
 }
 
 void FakeSamlIdp::SetUp(const std::string& base_path, const GURL& gaia_url) {
   base::FilePath test_data_dir;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
   html_template_dir_ = test_data_dir.Append("login");
 
-  login_path_= base_path;
+  login_path_ = base_path;
   login_auth_path_ = base_path + "Auth";
   gaia_assertion_url_ = gaia_url.Resolve("/SSO");
 }
 
 void FakeSamlIdp::SetLoginHTMLTemplate(const std::string& template_file) {
   EXPECT_TRUE(base::ReadFileToString(
       html_template_dir_.Append(template_file),
       &login_html_template_));
 }
 
@@ skipping 68 matching lines @@
   scoped_ptr<BasicHttpResponse> http_response(new BasicHttpResponse());
   http_response->set_code(net::HTTP_OK);
   http_response->set_content(response_html);
   http_response->set_content_type("text/html");
 
   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) { use_webview_ = GetParam(); }
+  SamlTest() : saml_load_injected_(false) {
+    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_->GetURL("");
     const GURL saml_idp_url = saml_https_forwarder_->GetURL("SAML");
     fake_saml_idp_.SetUp(saml_idp_url.path(), gaia_url);
     fake_gaia_->RegisterSamlUser(kFirstSAMLUserEmail, saml_idp_url);
     fake_gaia_->RegisterSamlUser(kSecondSAMLUserEmail, saml_idp_url);
@@ skipping 83 matching lines @@
 
 // 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')");
-  if (!use_webview_) {
+  if (!use_webview()) {
     JsExpect("!$('cancel-add-user-button').hidden");
   }
 
   // Click on 'cancel'.
   content::DOMMessageQueue message_queue;  // Observe before 'cancel'.
-  if (use_webview_) {
+  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_)
+  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());
 
@@ skipping 695 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