Remove stl_util's STLDeleteContainerPointers from autofill.

chrome/browser/password_manager/password_store_win_unittest.cc

Index: chrome/browser/password_manager/password_store_win_unittest.cc
diff --git a/chrome/browser/password_manager/password_store_win_unittest.cc b/chrome/browser/password_manager/password_store_win_unittest.cc
index 8e39222b0f996de95bda32c29296c80e13ba96c2..26b766dfa85f34725ccb310b3d54bf67f03e9995 100644
--- a/chrome/browser/password_manager/password_store_win_unittest.cc
+++ b/chrome/browser/password_manager/password_store_win_unittest.cc
@@ -66,8 +66,13 @@ class MockPasswordStoreConsumer : public PasswordStoreConsumer {
 
 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
@@ -198,7 +203,8 @@ ACTION(QuitUIMessageLoop) {
 }
 
 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();
 }
@@ -378,7 +384,7 @@ TEST_F(PasswordStoreWinTest, DISABLED_MultipleWDSQueriesOnDifferentThreads) {
 
   MockWebDataServiceConsumer wds_consumer;
 
-  EXPECT_CALL(wds_consumer, OnWebDataServiceRequestDone(_, _))
+  EXPECT_CALL(wds_consumer, OnWebDataServiceRequestDoneStub())
       .WillOnce(QuitUIMessageLoop());
 
   wds_->GetIE7Login(password_info, &wds_consumer);