PasswordForm -> FormDigest for GetLogins

chrome/browser/password_manager/password_store_win_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/password_manager/password_store_win.h"
 
 #include <windows.h>
 
 #include <memory>
 #include <string>
@@ skipping 228 matching lines @@
       "http://example.com/origin",
       "http://example.com/action",
       L"submit_element",
       L"username_element",
       L"password_element",
       L"",
       L"",
       true,
       1,
   };
-  std::unique_ptr<PasswordForm> form =
-      CreatePasswordFormFromDataForTesting(form_data);
+  PasswordStore::FormDigest form(
+      *CreatePasswordFormFromDataForTesting(form_data));
 
   // The returned form will not have 'action' or '*_element' fields set. This
   // is because credentials imported from IE don't have this information.
   PasswordFormData expected_form_data = {
       PasswordForm::SCHEME_HTML,
       "http://example.com/",
       "http://example.com/origin",
       "",
       L"",
       L"",
       L"",
       L"abcdefgh",
       L"abcdefghijkl",
       true,
       1,
   };
   ScopedVector<autofill::PasswordForm> expected_forms;
   expected_forms.push_back(
       CreatePasswordFormFromDataForTesting(expected_form_data));
 
   // The IE7 password should be returned.
   EXPECT_CALL(consumer,
               OnGetPasswordStoreResultsConstRef(
                   UnorderedPasswordFormElementsAre(expected_forms.get())));
 
-  store_->GetLogins(*form, &consumer);
+  store_->GetLogins(form, &consumer);
   base::MessageLoop::current()->Run();
 }
 
 TEST_F(PasswordStoreWinTest, OutstandingWDSQueries) {
   store_ = CreatePasswordStore();
   EXPECT_TRUE(store_->Init(syncer::SyncableService::StartSyncFlare()));
 
   PasswordFormData form_data = {
       PasswordForm::SCHEME_HTML,
       "http://example.com/",
       "http://example.com/origin",
       "http://example.com/action",
       L"submit_element",
       L"username_element",
       L"password_element",
       L"",
       L"",
       true,
       1,
   };
-  std::unique_ptr<PasswordForm> form =
-      CreatePasswordFormFromDataForTesting(form_data);
+  PasswordStore::FormDigest form(
+      *CreatePasswordFormFromDataForTesting(form_data));
 
   MockPasswordStoreConsumer consumer;
-  store_->GetLogins(*form, &consumer);
+  store_->GetLogins(form, &consumer);
 
   // Release the PSW and the WDS before the query can return.
   store_->ShutdownOnUIThread();
   store_ = nullptr;
   wds_->ShutdownOnUIThread();
   wds_ = nullptr;
   wdbs_->ShutdownDatabase();
   wdbs_ = nullptr;
 
   base::MessageLoop::current()->RunUntilIdle();
@@ skipping 30 matching lines @@
       "http://example.com/origin",
       "http://example.com/action",
       L"submit_element",
       L"username_element",
       L"password_element",
       L"",
       L"",
       true,
       1,
   };
-  std::unique_ptr<PasswordForm> form =
-      CreatePasswordFormFromDataForTesting(form_data);
+  PasswordStore::FormDigest form(
+      *CreatePasswordFormFromDataForTesting(form_data));
 
   PasswordFormData expected_form_data = {
       PasswordForm::SCHEME_HTML,
       "http://example.com/",
       "http://example.com/origin",
       "http://example.com/action",
       L"submit_element",
       L"username_element",
       L"password_element",
       L"abcdefgh",
       L"abcdefghijkl",
       true,
       1,
   };
   ScopedVector<autofill::PasswordForm> expected_forms;
   expected_forms.push_back(
       CreatePasswordFormFromDataForTesting(expected_form_data));
 
   // The IE7 password should be returned.
   EXPECT_CALL(password_consumer,
               OnGetPasswordStoreResultsConstRef(
                   UnorderedPasswordFormElementsAre(expected_forms.get())));
 
-  store_->GetLogins(*form, &password_consumer);
+  store_->GetLogins(form, &password_consumer);
 
   MockWebDataServiceConsumer wds_consumer;
 
   EXPECT_CALL(wds_consumer, OnWebDataServiceRequestDone(_, _))
       .WillOnce(QuitUIMessageLoop());
 
   wds_->GetIE7Login(password_info, &wds_consumer);
 
   // Run the MessageLoop twice: once for the GetIE7Login that PasswordStoreWin
   // schedules on the DB thread and once for the one we just scheduled on the UI
@@ skipping 12 matching lines @@
       "http://example.com/origin",
       "http://example.com/action",
       L"submit_element",
       L"username_element",
       L"password_element",
       L"",
       L"",
       true,
       1,
   };
-  std::unique_ptr<PasswordForm> form =
-      CreatePasswordFormFromDataForTesting(form_data);
+  PasswordStore::FormDigest form(
+      *CreatePasswordFormFromDataForTesting(form_data));
 
   MockPasswordStoreConsumer consumer;
 
   // Make sure we quit the MessageLoop even if the test fails.
   ON_CALL(consumer, OnGetPasswordStoreResultsConstRef(_))
       .WillByDefault(QuitUIMessageLoop());
 
   EXPECT_CALL(consumer, OnGetPasswordStoreResultsConstRef(IsEmpty()));
 
-  store_->GetLogins(*form, &consumer);
+  store_->GetLogins(form, &consumer);
   base::MessageLoop::current()->Run();
 }
 
 TEST_F(PasswordStoreWinTest, EmptyBlacklistLogins) {
   store_ = CreatePasswordStore();
   store_->Init(syncer::SyncableService::StartSyncFlare());
 
   MockPasswordStoreConsumer consumer;
 
   // Make sure we quit the MessageLoop even if the test fails.
@@ skipping 14 matching lines @@
 
   // Make sure we quit the MessageLoop even if the test fails.
   ON_CALL(consumer, OnGetPasswordStoreResultsConstRef(_))
       .WillByDefault(QuitUIMessageLoop());
 
   EXPECT_CALL(consumer, OnGetPasswordStoreResultsConstRef(IsEmpty()));
 
   store_->GetAutofillableLogins(&consumer);
   base::MessageLoop::current()->Run();
 }