Move Credentials when migrating to HSTS page

components/password_manager/core/browser/obsolete_http_cleaner_unittest.cc

Index: components/password_manager/core/browser/obsolete_http_cleaner_unittest.cc
diff --git a/components/password_manager/core/browser/obsolete_http_cleaner_unittest.cc b/components/password_manager/core/browser/obsolete_http_cleaner_unittest.cc
index 7ae1fd70d402cec287f699db6e68d8721fdb67db..b3898cf6a023206951c61767f261764960fba0ea 100644
--- a/components/password_manager/core/browser/obsolete_http_cleaner_unittest.cc
+++ b/components/password_manager/core/browser/obsolete_http_cleaner_unittest.cc
@@ -18,6 +18,8 @@
 
 using autofill::PasswordForm;
 using testing::Return;
+using testing::WithArg;
+using testing::_;
 
 namespace password_manager {
 
@@ -75,7 +77,8 @@ class MockPasswordManagerClient : public StubPasswordManagerClient {
   explicit MockPasswordManagerClient(PasswordStore* store) : store_(store) {}
 
   PasswordStore* GetPasswordStore() const override { return store_; }
-  MOCK_CONST_METHOD1(IsHSTSActiveForHost, bool(const GURL&));
+  MOCK_CONST_METHOD2(PostHSTSQueryForHost,
+                     void(const GURL&, const HSTSCallback& callback));
 
  private:
   PasswordStore* store_;
@@ -83,6 +86,10 @@ class MockPasswordManagerClient : public StubPasswordManagerClient {
   DISALLOW_COPY_AND_ASSIGN(MockPasswordManagerClient);
 };
 
+ACTION_P(InvokeCallbackWith, arg) {
+  arg0.Run(arg);
+}
+
 }  // namespace
 
 class ObsoleteHttpCleanerTest : public testing::Test {
@@ -131,8 +138,8 @@ TEST_F(ObsoleteHttpCleanerTest, TestBlacklistDeletion) {
         test_case.is_http ? CreateTestHTTPForm() : CreateTestHTTPSForm();
     form.blacklisted_by_user = test_case.is_blacklisted;
     if (test_case.is_http && test_case.is_blacklisted) {
-      EXPECT_CALL(client(), IsHSTSActiveForHost(form.origin))
-          .WillOnce(Return(test_case.is_hsts));
+      EXPECT_CALL(client(), PostHSTSQueryForHost(form.origin, _))
+          .WillOnce(WithArg<1>(InvokeCallbackWith(test_case.is_hsts)));

[vasilii, 2017/03/08 13:31:16]

I'd split the callback from the expectation.

EXPECT_CALL();
cleaner.OnGetPasswordStoreResults(MakeResults({form}));
EXPECT_CALL(store(), RemoveLogin(form)).Times(test_case.is_deleted);
call the callback

[jdoerrie, 2017/03/09 18:35:49]

Done.

     }
 
     EXPECT_CALL(store(), RemoveLogin(form)).Times(test_case.is_deleted);
@@ -188,8 +195,11 @@ TEST_F(ObsoleteHttpCleanerTest, TestAutofillableDeletion) {
           https_form.password_value + base::ASCIIToUTF16("-different");
     }
 
-    EXPECT_CALL(client(), IsHSTSActiveForHost(https_form.origin))
-        .WillOnce(Return(test_case.is_hsts));
+    if (test_case.same_host && test_case.same_user && test_case.same_pass) {
+      EXPECT_CALL(client(), PostHSTSQueryForHost(http_form.origin, _))
+          .WillOnce(WithArg<1>(InvokeCallbackWith(test_case.is_hsts)));
+    }
+
     EXPECT_CALL(store(), RemoveLogin(http_form)).Times(test_case.is_deleted);
     cleaner.OnGetPasswordStoreResults(MakeResults({http_form, https_form}));
   }
@@ -219,8 +229,8 @@ TEST_F(ObsoleteHttpCleanerTest, TestSiteStatsDeletion) {
     InteractionsStats stats =
         test_case.is_http ? CreateTestHTTPStats() : CreateTestHTTPSStats();
     if (test_case.is_http) {
-      EXPECT_CALL(client(), IsHSTSActiveForHost(stats.origin_domain))
-          .WillOnce(Return(test_case.is_hsts));
+      EXPECT_CALL(client(), PostHSTSQueryForHost(stats.origin_domain, _))
+          .WillOnce(WithArg<1>(InvokeCallbackWith(test_case.is_hsts)));
     }
 
     EXPECT_CALL(store(), RemoveSiteStatsImpl(stats.origin_domain))