Introduce PasswordFormManager::GrabFetcher

components/password_manager/core/browser/password_form_manager.h

 // 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.
 
 #ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_FORM_MANAGER_H_
 #define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_FORM_MANAGER_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 230 matching lines @@
       const base::string16& generation_field);
 
   FormSaver* form_saver() { return form_saver_.get(); }
 
   // Clears references to matches derived from the associated FormFetcher data.
   // After calling this, the PasswordFormManager holds no references to objects
   // owned by the associated FormFetcher. This does not cause removing |this| as
   // a consumer of |form_fetcher_|.
   void ResetStoredMatches();
 
-  // Takes ownership of |fetcher|.
-  // TODO(crbug.com/621355) Until https://codereview.chromium.org/2758773002/,
-  // |fetcher.get()| must be the same as |form_fetcher_|.
+  // Takes ownership of |fetcher|. If |fetcher| is different from the current
+  // |form_fetcher_| then also resets matches stored from the old fetcher and
+  // adds itself as a consumer of the new one.
   void GrabFetcher(std::unique_ptr<FormFetcher> fetcher);
 
  protected:
   // FormFetcher::Consumer:
   void ProcessMatches(
       const std::vector<const autofill::PasswordForm*>& non_federated,
       size_t filtered_count) override;
 
  private:
   // ManagerAction - What does the manager do with this form? Either it
@@ skipping 313 matching lines @@
   // True if the main frame's visible URL, at the time this PasswordFormManager
   // was created, is secure.
   bool is_main_frame_secure_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordFormManager);
 };
 
 }  // namespace password_manager
 
 #endif  // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_FORM_MANAGER_H_