Add FormFetcher::RemoveConsumer

components/password_manager/core/browser/password_form_manager_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 "components/password_manager/core/browser/password_form_manager.h"
 
 #include <map>
 #include <memory>
 #include <set>
 #include <utility>
@@ skipping 83 matching lines @@
     return *static_cast<MockFormSaver*>(form_manager->form_saver());
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockFormSaver);
 };
 
 class MockFormFetcher : public FakeFormFetcher {
  public:
   MOCK_METHOD1(AddConsumer, void(Consumer*));
+  MOCK_METHOD1(RemoveConsumer, void(Consumer*));
 };
 
 MATCHER_P(CheckUsername, username_value, "Username incorrect") {
   return arg.username_value == username_value;
 }
 
 MATCHER_P(CheckUsernamePtr, username_value, "Username incorrect") {
   return arg && arg->username_value == username_value;
 }
 
@@ skipping 579 matching lines @@
 
  private:
   // Necessary for callbacks, and for TestAutofillDriver.
   base::MessageLoop message_loop_;
 
   PasswordForm observed_form_;
   PasswordForm saved_match_;
   PasswordForm psl_saved_match_;
   TestPasswordManagerClient client_;
   std::unique_ptr<PasswordManager> password_manager_;
+  // Define |fake_form_fetcher_| before |form_manager_|, because the former
+  // needs to outlive the latter.
+  FakeFormFetcher fake_form_fetcher_;
   std::unique_ptr<PasswordFormManager> form_manager_;
-  FakeFormFetcher fake_form_fetcher_;
 };
 
 class PasswordFormManagerFillOnAccountSelectTest
     : public PasswordFormManagerTest {
  public:
   PasswordFormManagerFillOnAccountSelectTest() {
     scoped_feature_list_.InitAndEnableFeature(features::kFillOnAccountSelect);
   }
 
   base::test::ScopedFeatureList scoped_feature_list_;
@@ skipping 2242 matching lines @@
   form_manager()->ProvisionallySave(
       updated, PasswordFormManager::IGNORE_OTHER_POSSIBLE_USERNAMES);
   credentials_to_update.clear();
   EXPECT_CALL(MockFormSaver::Get(form_manager()), Update(_, _, _, nullptr))
       .WillOnce(SaveArgPointee<2>(&credentials_to_update));
   form_manager()->Save();
 
   EXPECT_THAT(credentials_to_update, IsEmpty());
 }
 
+// Check that on changing FormFetcher, the PasswordFormManager removes itself
+// from consuming the old one.
+TEST_F(PasswordFormManagerTest, DropFetcherOnDestruction) {
+  MockFormFetcher fetcher;
+  FormFetcher::Consumer* added_consumer = nullptr;
+  EXPECT_CALL(fetcher, AddConsumer(_)).WillOnce(SaveArg<0>(&added_consumer));
+  auto form_manager = base::MakeUnique<PasswordFormManager>(
+      password_manager(), client(), client()->driver(), *observed_form(),
+      base::MakeUnique<MockFormSaver>(), &fetcher);
+  EXPECT_EQ(form_manager.get(), added_consumer);
+
+  EXPECT_CALL(fetcher, RemoveConsumer(form_manager.get()));
+  form_manager.reset();
+}
+
 // Check that if asked to take ownership of the same FormFetcher which it had
 // consumed before, the PasswordFormManager does not add itself as a consumer
 // again.
 TEST_F(PasswordFormManagerTest, GrabFetcher_Same) {
   auto fetcher = base::MakeUnique<MockFormFetcher>();
   fetcher->Fetch();
   PasswordFormManager form_manager(
       password_manager(), client(), client()->driver(), *observed_form(),
       base::MakeUnique<MockFormSaver>(), fetcher.get());
 
   EXPECT_CALL(*fetcher, AddConsumer(_)).Times(0);
   form_manager.GrabFetcher(std::move(fetcher));
 }
 
 }  // namespace password_manager