Enable CredentialManagerBrowserTest.ObsoleteHttpCredentialMovedOnMigrationToHstsSite

chrome/browser/password_manager/credential_manager_browsertest.cc

 // Copyright 2016 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 "base/macros.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_manager_test_base.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 144 matching lines @@
 
   // There should be an entry for both psl.example.com and www.example.com.
   password_manager::TestPasswordStore::PasswordMap passwords =
       password_store->stored_passwords();
   GURL www_url = https_test_server().GetURL("www.example.com", "/");
   EXPECT_EQ(2U, passwords.size());
   EXPECT_TRUE(base::ContainsKey(passwords, psl_url.spec()));
   EXPECT_TRUE(base::ContainsKey(passwords, www_url.spec()));
 }
 
-// Flaky. See crbug.com/703305
 IN_PROC_BROWSER_TEST_F(CredentialManagerBrowserTest,
-    DISABLED_ObsoleteHttpCredentialMovedOnMigrationToHstsSite) {
+                       ObsoleteHttpCredentialMovedOnMigrationToHstsSite) {
   // Add an http credential to the password store.
   GURL https_origin = https_test_server().base_url();
   ASSERT_TRUE(https_origin.SchemeIs(url::kHttpsScheme));
   GURL::Replacements rep;
   rep.SetSchemeStr(url::kHttpScheme);
   GURL http_origin = https_origin.ReplaceComponents(rep);
   autofill::PasswordForm http_form;
   http_form.signon_realm = http_origin.spec();
   http_form.origin = http_origin;
   http_form.username_value = base::ASCIIToUTF16("user");
   http_form.password_value = base::ASCIIToUTF16("12345");
   scoped_refptr<password_manager::TestPasswordStore> password_store =
       static_cast<password_manager::TestPasswordStore*>(
           PasswordStoreFactory::GetForProfile(
               browser()->profile(), ServiceAccessType::IMPLICIT_ACCESS)
               .get());
   password_store->AddLogin(http_form);
   WaitForPasswordStore();
 
   // Treat the host of the HTTPS test server as HSTS.
   AddHSTSHost(https_test_server().host_port_pair().host());
 
   // Navigate to HTTPS page and trigger the migration.
   ui_test_utils::NavigateToURL(
       browser(), https_test_server().GetURL("/password/done.html"));
 
-  // Call the API to trigger |get| and |store| and redirect.
+  // Call the API to trigger the account chooser.
   ASSERT_TRUE(content::ExecuteScript(
       RenderViewHost(), "navigator.credentials.get({password: true})"));
+  BubbleObserver(WebContents()).WaitForAccountChooser();
 
-  // Issue the query for HTTPS credentials.
   WaitForPasswordStore();

[vabr (Chromium), 2017/03/21 18:46:51]

It would still be helpful to comment (in the code) on what PasswordStore query
this represents. There must have been one to produce the account chooser
already, so please comment on what the current query is for.

[vasilii, 2017/03/22 09:28:58]

Done.

-
-  // Realize there are no HTTPS credentials and issue the query for HTTP
-  // credentials instead.
-  WaitForPasswordStore();
-
-  // Sync with IO thread before continuing. This is necessary, because the
-  // credential migration triggers a query for the HSTS state which gets
-  // executed on the IO thread. The actual task is empty, because only the reply
-  // is relevant. By the time the reply is executed it is guaranteed that the
-  // migration is completed.
-  const auto empty_lambda = []() {};
-  base::RunLoop run_loop;
-  content::BrowserThread::PostTaskAndReply(content::BrowserThread::IO,
-                                           FROM_HERE, base::Bind(empty_lambda),
-                                           run_loop.QuitClosure());
-  run_loop.Run();
-
   // Only HTTPS passwords should be present.
   EXPECT_TRUE(
       password_store->stored_passwords().at(http_origin.spec()).empty());
   EXPECT_FALSE(
       password_store->stored_passwords().at(https_origin.spec()).empty());
 }
 
 IN_PROC_BROWSER_TEST_F(CredentialManagerBrowserTest,
                        AutoSigninOldCredentialAndNavigation) {
   // Save credentials with 'skip_zero_click' false.
@@ skipping 120 matching lines @@
   signin_form.skip_zero_click = false;
   signin_form.times_used = 1;
   signin_form.password_value = base::ASCIIToUTF16("API");
   password_manager::TestPasswordStore::PasswordMap stored =
       password_store->stored_passwords();
   ASSERT_EQ(1u, stored.size());
   EXPECT_EQ(signin_form, stored[signin_form.signon_realm][0]);
 }
 
 }  // namespace