components/autofill: scoped_ptr -> unique_ptr

components/autofill/core/browser/autofill_manager.h

 // Copyright 2013 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_AUTOFILL_CORE_BROWSER_AUTOFILL_MANAGER_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_MANAGER_H_
 
 #include <deque>
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "components/autofill/core/browser/autocomplete_history_manager.h"
 #include "components/autofill/core/browser/autofill_client.h"
 #include "components/autofill/core/browser/autofill_download_manager.h"
 #include "components/autofill/core/browser/autofill_driver.h"
 #include "components/autofill/core/browser/autofill_metrics.h"
@@ skipping 133 matching lines @@
   // if this form is not relevant for Autofill.
   bool OnWillSubmitForm(const FormData& form, const base::TimeTicks& timestamp);
 
   // Processes the submitted |form|, saving any new Autofill data to the user's
   // personal profile. Returns false if this form is not relevant for Autofill.
   bool OnFormSubmitted(const FormData& form);
 
   // Will send an upload based on the |form_structure| data and the local
   // Autofill profile data. |observed_submission| is specified if the upload
   // follows an observed submission event.
-  void StartUploadProcess(scoped_ptr<FormStructure> form_structure,
+  void StartUploadProcess(std::unique_ptr<FormStructure> form_structure,
                           const base::TimeTicks& timestamp,
                           bool observed_submission);
 
   // Update the pending form with |form|, possibly processing the current
   // pending form for upload.
   void UpdatePendingForm(const FormData& form);
 
   // Upload the current pending form.
   void ProcessPendingFormForUpload();
 
@@ skipping 89 matching lines @@
   void OnUnmaskResponse(const UnmaskResponse& response) override;
   void OnUnmaskPromptClosed() override;
 
   // payments::PaymentsClientDelegate:
   IdentityProvider* GetIdentityProvider() override;
   void OnDidGetRealPan(AutofillClient::PaymentsRpcResult result,
                        const std::string& real_pan) override;
   void OnDidGetUploadDetails(
       AutofillClient::PaymentsRpcResult result,
       const base::string16& context_token,
-      scoped_ptr<base::DictionaryValue> legal_message) override;
+      std::unique_ptr<base::DictionaryValue> legal_message) override;
   void OnDidUploadCard(AutofillClient::PaymentsRpcResult result) override;
 
   // Saves risk data in |unmasking_risk_data_| and calls UnmaskCard if the user
   // has accepted the prompt.
   void OnDidGetUnmaskRiskData(const std::string& risk_data);
 
   // Sets |user_did_accept_upload_prompt_| and calls UploadCard if the risk data
   // is available.
   void OnUserDidAcceptUpload();
 
@@ skipping 43 matching lines @@
   void FillOrPreviewDataModelForm(AutofillDriver::RendererFormDataAction action,
                                   int query_id,
                                   const FormData& form,
                                   const FormFieldData& field,
                                   const AutofillDataModel& data_model,
                                   bool is_credit_card);
 
   // Creates a FormStructure using the FormData received from the renderer. Will
   // return an empty scoped_ptr if the data should not be processed for upload
   // or personal data.
-  scoped_ptr<FormStructure> ValidateSubmittedForm(const FormData& form);
+  std::unique_ptr<FormStructure> ValidateSubmittedForm(const FormData& form);
 
   // Fills |form_structure| cached element corresponding to |form|.
   // Returns false if the cached element was not found.
   bool FindCachedForm(const FormData& form,
                       FormStructure** form_structure) const WARN_UNUSED_RESULT;
 
   // Fills |form_structure| and |autofill_field| with the cached elements
   // corresponding to |form| and |field|.  This might have the side-effect of
   // updating the cache.  Returns false if the |form| is not autofillable, or if
   // it is not already present in the cache and the cache is full.
@@ skipping 83 matching lines @@
   void DumpAutofillData(bool imported_cc) const;
 #endif
 
   // Provides driver-level context to the shared code of the component. Must
   // outlive this object.
   AutofillDriver* driver_;
 
   AutofillClient* const client_;
 
   // Handles Payments service requests.
-  scoped_ptr<payments::PaymentsClient> payments_client_;
+  std::unique_ptr<payments::PaymentsClient> payments_client_;
 
   std::string app_locale_;
 
   // The personal data manager, used to save and load personal data to/from the
   // web database.  This is overridden by the AutofillManagerTest.
   // Weak reference.
   // May be NULL.  NULL indicates OTR.
   PersonalDataManager* personal_data_;
 
   std::deque<std::string> autofilled_form_signatures_;
 
   // Handles queries and uploads to Autofill servers. Will be NULL if
   // the download manager functionality is disabled.
-  scoped_ptr<AutofillDownloadManager> download_manager_;
+  std::unique_ptr<AutofillDownloadManager> download_manager_;
 
   // Handles single-field autocomplete form data.
-  scoped_ptr<AutocompleteHistoryManager> autocomplete_history_manager_;
+  std::unique_ptr<AutocompleteHistoryManager> autocomplete_history_manager_;
 
   // Utilities for logging form events.
-  scoped_ptr<AutofillMetrics::FormEventLogger> address_form_event_logger_;
-  scoped_ptr<AutofillMetrics::FormEventLogger> credit_card_form_event_logger_;
+  std::unique_ptr<AutofillMetrics::FormEventLogger> address_form_event_logger_;
+  std::unique_ptr<AutofillMetrics::FormEventLogger>
+      credit_card_form_event_logger_;
 
   // Have we logged whether Autofill is enabled for this page load?
   bool has_logged_autofill_enabled_;
   // Have we logged an address suggestions count metric for this page?
   bool has_logged_address_suggestions_count_;
   // Have we shown Autofill suggestions at least once?
   bool did_show_suggestions_;
   // Has the user manually edited at least one form field among the autofillable
   // ones?
   bool user_did_type_;
   // Has the user autofilled a form on this page?
   bool user_did_autofill_;
   // Has the user edited a field that was previously autofilled?
   bool user_did_edit_autofilled_field_;
   // When the form finished loading.
   std::map<FormData, base::TimeTicks> forms_loaded_timestamps_;
   // When the user first interacted with a potentially fillable form on this
   // page.
   base::TimeTicks initial_interaction_timestamp_;
 
   // Our copy of the form data.
   ScopedVector<FormStructure> form_structures_;
 
   // A copy of the currently interacted form data.
-  scoped_ptr<FormData> pending_form_data_;
+  std::unique_ptr<FormData> pending_form_data_;
 
   // Collected information about a pending unmask request, and data about the
   // form.
   payments::PaymentsClient::UnmaskRequestDetails unmask_request_;
   int unmasking_query_id_;
   FormData unmasking_form_;
   FormFieldData unmasking_field_;
   // Time when we requested the last real pan.
   base::Time real_pan_request_timestamp_;
 
@@ skipping 77 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(AutofillManagerTest,
                            DontSaveCvcInAutocompleteHistory);
   FRIEND_TEST_ALL_PREFIXES(AutofillManagerTest, DontOfferToSavePaymentsCard);
   FRIEND_TEST_ALL_PREFIXES(AutofillManagerTest, FillInUpdatedExpirationDate);
   DISALLOW_COPY_AND_ASSIGN(AutofillManager);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_MANAGER_H_