Add FormFetcher::RemoveConsumer

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 24 matching lines @@
 // A map from field names to field types.
 using FieldTypeMap = std::map<base::string16, autofill::ServerFieldType>;
 
 // This class helps with filling the observed form (both HTML and from HTTP
 // auth) and with saving/updating the stored information about it.
 class PasswordFormManager : public FormFetcher::Consumer {
  public:
   // |password_manager| owns |this|, |client| and |driver| serve to
   // communicate with embedder, |observed_form| is the associated form |this|
   // is managing, |form_saver| is used to save/update the form and
-  // |form_fetcher| to get saved data about the form.
+  // |form_fetcher| to get saved data about the form. |form_fetcher| must not be
+  // destroyed before |this|.
   //
   // TODO(crbug.com/621355): So far, |form_fetcher| can be null. In that case
   // |this| creates an instance of it itself (meant for production code). Once
   // the fetcher is shared between PasswordFormManager instances, it will be
   // required that |form_fetcher| is not null.
   PasswordFormManager(PasswordManager* password_manager,
                       PasswordManagerClient* client,
                       const base::WeakPtr<PasswordManagerDriver>& driver,
                       const autofill::PasswordForm& observed_form,
                       std::unique_ptr<FormSaver> form_saver,
@@ skipping 180 matching lines @@
   void OnNoInteraction(bool is_update);
 
   // Saves the outcome of HTML parsing based form classifier to upload proto.
   void SaveGenerationFieldDetectedByClassifier(
       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.
+  // 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_|.
   void GrabFetcher(std::unique_ptr<FormFetcher> fetcher);
 
  protected:
   // FormFetcher::Consumer:
   void ProcessMatches(
@@ skipping 318 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_