Remove stl_util's STLDeleteContainerPointers from autofill.

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 48 matching lines @@
 
   // GMock cannot mock methods with move-only args.
   void OnGetPasswordStoreResults(
       std::vector<std::unique_ptr<PasswordForm>> results) override {
     OnGetPasswordStoreResultsConstRef(results);
   }
 };
 
 class MockWebDataServiceConsumer : public WebDataServiceConsumer {
  public:
-  MOCK_METHOD2(OnWebDataServiceRequestDone,
-               void(PasswordWebDataService::Handle, const WDTypedResult*));
+  MOCK_METHOD0(OnWebDataServiceRequestDoneStub, void());
+
+  // GMock cannot mock methods with move-only args.
+  void OnWebDataServiceRequestDone(WebDataServiceBase::Handle h,
+                                   std::unique_ptr<WDTypedResult> result) {
+    OnWebDataServiceRequestDoneStub();
+  }
 };
 
 }  // anonymous namespace
 
 class PasswordStoreWinTest : public testing::Test {
  protected:
   PasswordStoreWinTest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
         db_thread_(BrowserThread::DB) {}
 
@@ skipping 110 matching lines @@
 ACTION(STLDeleteElements0) {
   base::STLDeleteContainerPointers(arg0.begin(), arg0.end());
 }
 
 ACTION(QuitUIMessageLoop) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   base::MessageLoop::current()->QuitWhenIdle();
 }
 
 MATCHER(EmptyWDResult, "") {
-  return static_cast<const WDResult<std::vector<PasswordForm*>>*>(arg)
+  return static_cast<
+             const WDResult<std::vector<std::unique_ptr<PasswordForm>>>*>(arg)
       ->GetValue()
       .empty();
 }
 
 // Hangs flakily, http://crbug.com/71385.
 TEST_F(PasswordStoreWinTest, DISABLED_ConvertIE7Login) {
   IE7PasswordInfo password_info;
   ASSERT_TRUE(CreateIE7PasswordInfo(L"http://example.com/origin",
                                     base::Time::FromDoubleT(1),
                                     &password_info));
@@ skipping 159 matching lines @@
 
   // The IE7 password should be returned.
   EXPECT_CALL(password_consumer,
               OnGetPasswordStoreResultsConstRef(
                   UnorderedPasswordFormElementsAre(&expected_forms)));
 
   store_->GetLogins(form, &password_consumer);
 
   MockWebDataServiceConsumer wds_consumer;
 
-  EXPECT_CALL(wds_consumer, OnWebDataServiceRequestDone(_, _))
+  EXPECT_CALL(wds_consumer, OnWebDataServiceRequestDoneStub())
       .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
   // thread.
   base::RunLoop().Run();
   base::RunLoop().Run();
 }
@@ skipping 54 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::RunLoop().Run();
 }