[Autofill] Raw pointers -> Smart pointers.

Change some of the autofill constructors to use std::unique_ptrs
instead of the raw pointers.

Bug: 794647
Change-Id: I364b59e867952dc48a66baf605a4dc23f33e7110
Reviewed-on: https://chromium-review.googlesource.com/843130
Commit-Queue: Parastoo Geranmayeh <parastoog@google.com>
Reviewed-by: Sebastien Seguin-Gagnon <sebsg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#526813}

components/autofill/core/browser/credit_card_save_manager_unittest.cc

@@ -108,7 +108,8 @@ class CreditCardSaveManagerTest : public testing::Test {
                                       payments_client_, &personal_data_);
     autofill_manager_.reset(new TestAutofillManager(
         autofill_driver_.get(), &autofill_client_, &personal_data_,
-        credit_card_save_manager_, payments_client_));
+        std::unique_ptr<CreditCardSaveManager>(credit_card_save_manager_),
+        payments_client_));
     autofill_manager_->SetExpectedObservedSubmission(true);
   }
 
@@ -146,8 +147,7 @@ class CreditCardSaveManagerTest : public testing::Test {
     scoped_feature_list_.InitWithFeatures(
         {kAutofillUpstreamRequestCvcIfMissing,
          kAutofillUpstreamSendDetectedValues},  // Enabled
-        {}                                      // Disabled
-        );
+        {});                                    // Disabled
   }
 
   void EnableAutofillUpstreamSendPanFirstSixExperiment() {

components/autofill/core/browser/form_data_importer.h

@@ -8,6 +8,7 @@
 #include <map>
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "build/build_config.h"
@@ -49,8 +50,8 @@ class FormDataImporter {
  protected:
   // Exposed for testing.
   void set_credit_card_save_manager(
-      CreditCardSaveManager* credit_card_save_manager) {
-    credit_card_save_manager_.reset(credit_card_save_manager);
+      std::unique_ptr<CreditCardSaveManager> credit_card_save_manager) {
+    credit_card_save_manager_ = std::move(credit_card_save_manager);
   }
 
  private:

components/autofill/core/browser/test_autofill_manager.cc

@@ -29,14 +29,14 @@ TestAutofillManager::TestAutofillManager(
     AutofillDriver* driver,
     AutofillClient* client,
     TestPersonalDataManager* personal_data,
-    CreditCardSaveManager* credit_card_save_manager,
+    std::unique_ptr<CreditCardSaveManager> credit_card_save_manager,
     payments::TestPaymentsClient* payments_client)
     : AutofillManager(driver, client, personal_data),
       personal_data_(personal_data),
       test_form_data_importer_(
           new TestFormDataImporter(client,
                                    payments_client,
-                                   credit_card_save_manager,
+                                   std::move(credit_card_save_manager),
                                    personal_data,
                                    "en-US")) {
   set_payments_client(payments_client);

components/autofill/core/browser/test_autofill_manager.h

@@ -5,7 +5,9 @@
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_TEST_AUTOFILL_MANAGER_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_TEST_AUTOFILL_MANAGER_H_
 
+#include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "base/optional.h"
@@ -34,11 +36,12 @@ class TestAutofillManager : public AutofillManager {
                       AutofillClient* client,
                       TestPersonalDataManager* personal_data);
   // Called by CreditCardSaveManagerTest.
-  TestAutofillManager(AutofillDriver* driver,
-                      AutofillClient* client,
-                      TestPersonalDataManager* personal_data,
-                      CreditCardSaveManager* credit_card_save_manager,
-                      payments::TestPaymentsClient* payments_client);
+  TestAutofillManager(
+      AutofillDriver* driver,
+      AutofillClient* client,
+      TestPersonalDataManager* personal_data,
+      std::unique_ptr<CreditCardSaveManager> credit_card_save_manager,
+      payments::TestPaymentsClient* payments_client);
   ~TestAutofillManager() override;
 
   // AutofillManager overrides.

components/autofill/core/browser/test_form_data_importer.cc

@@ -9,14 +9,14 @@ namespace autofill {
 TestFormDataImporter::TestFormDataImporter(
     AutofillClient* client,
     payments::PaymentsClient* payments_client,
-    CreditCardSaveManager* credit_card_save_manager,
+    std::unique_ptr<CreditCardSaveManager> credit_card_save_manager,
     PersonalDataManager* personal_data_manager,
     const std::string& app_locale)
     : FormDataImporter(client,
                        payments_client,
                        personal_data_manager,
                        app_locale) {
-  set_credit_card_save_manager(credit_card_save_manager);
+  set_credit_card_save_manager(std::move(credit_card_save_manager));
 }
 
 }  // namespace autofill

components/autofill/core/browser/test_form_data_importer.h

@@ -5,17 +5,21 @@
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_TEST_FORM_DATA_IMPORTER_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_TEST_FORM_DATA_IMPORTER_H_
 
+#include <memory>
+#include <utility>
+
 #include "components/autofill/core/browser/form_data_importer.h"
 
 namespace autofill {
 
 class TestFormDataImporter : public FormDataImporter {
  public:
-  TestFormDataImporter(AutofillClient* client,
-                       payments::PaymentsClient* payments_client,
-                       CreditCardSaveManager* credit_card_save_manager,
-                       PersonalDataManager* personal_data_manager,
-                       const std::string& app_locale);
+  TestFormDataImporter(
+      AutofillClient* client,
+      payments::PaymentsClient* payments_client,
+      std::unique_ptr<CreditCardSaveManager> credit_card_save_manager,
+      PersonalDataManager* personal_data_manager,
+      const std::string& app_locale);
 };
 
 }  // namespace autofill