components/autofill: scoped_ptr -> unique_ptr

components/autofill/core/browser/test_autofill_client.h

Index: components/autofill/core/browser/test_autofill_client.h
diff --git a/components/autofill/core/browser/test_autofill_client.h b/components/autofill/core/browser/test_autofill_client.h
index d11e8740314fa43ba59e5f931358927f175c72bd..f9ebbaaadd316e0b16676abe60bf1188ada6504e 100644
--- a/components/autofill/core/browser/test_autofill_client.h
+++ b/components/autofill/core/browser/test_autofill_client.h
@@ -5,12 +5,12 @@
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_TEST_AUTOFILL_CLIENT_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_TEST_AUTOFILL_CLIENT_H_
 
+#include <memory>
 #include <utility>
 
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "components/autofill/core/browser/autofill_client.h"
 #include "components/prefs/pref_service.h"
 #include "components/rappor/test_rappor_service.h"
@@ -41,7 +41,7 @@ class TestAutofillClient : public AutofillClient {
                                     const base::Closure& callback) override;
   void ConfirmSaveCreditCardToCloud(
       const CreditCard& card,
-      scoped_ptr<base::DictionaryValue> legal_message,
+      std::unique_ptr<base::DictionaryValue> legal_message,
       const base::Closure& callback) override;
   void LoadRiskData(
       const base::Callback<void(const std::string&)>& callback) override;
@@ -72,7 +72,9 @@ class TestAutofillClient : public AutofillClient {
     is_context_secure_ = is_context_secure;
   };
 
-  void SetPrefs(scoped_ptr<PrefService> prefs) { prefs_ = std::move(prefs); }
+  void SetPrefs(std::unique_ptr<PrefService> prefs) {
+    prefs_ = std::move(prefs);
+  }
 
   rappor::TestRapporService* test_rappor_service() {
     return rappor_service_.get();
@@ -80,10 +82,10 @@ class TestAutofillClient : public AutofillClient {
 
  private:
   // NULL by default.
-  scoped_ptr<PrefService> prefs_;
-  scoped_ptr<FakeOAuth2TokenService> token_service_;
-  scoped_ptr<FakeIdentityProvider> identity_provider_;
-  scoped_ptr<rappor::TestRapporService> rappor_service_;
+  std::unique_ptr<PrefService> prefs_;
+  std::unique_ptr<FakeOAuth2TokenService> token_service_;
+  std::unique_ptr<FakeIdentityProvider> identity_provider_;
+  std::unique_ptr<rappor::TestRapporService> rappor_service_;
 
   bool is_context_secure_;