PasswordFormManager::form_fetcher_impl_ -> owned_form_fetcher_

components/password_manager/core/browser/password_form_manager.h

Index: components/password_manager/core/browser/password_form_manager.h
diff --git a/components/password_manager/core/browser/password_form_manager.h b/components/password_manager/core/browser/password_form_manager.h
index 47429bd652610226b9cd6e39df5f41691cfa4aac..eb9d1d98728d85c80d124618d2a7ad2486846e09 100644
--- a/components/password_manager/core/browser/password_form_manager.h
+++ b/components/password_manager/core/browser/password_form_manager.h
@@ -21,7 +21,6 @@
 #include "components/autofill/core/browser/form_structure.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/password_manager/core/browser/form_fetcher.h"
-#include "components/password_manager/core/browser/form_fetcher_impl.h"
 #include "components/password_manager/core/browser/password_manager_driver.h"
 #include "components/password_manager/core/browser/password_store.h"
 
@@ -562,10 +561,8 @@ class PasswordFormManager : public FormFetcher::Consumer {
   // credentials.
   std::unique_ptr<FormSaver> form_saver_;
 
-  // TODO(crbug.com/621355) Remove this, ultimately the form fetcher will not be
-  // owned by PasswordFormManager. Temporarily, this is the object which
-  // |form_fetcher_| points to, unless set otherwise in the constructor.
-  std::unique_ptr<FormFetcherImpl> form_fetcher_impl_;
+  // When not null, then this is the object which |form_fetcher_| points to.
+  std::unique_ptr<FormFetcher> owned_form_fetcher_;
 
   // FormFetcher instance which owns the login data from PasswordStore.
   FormFetcher* const form_fetcher_;