components/autofill: scoped_ptr -> unique_ptr

components/autofill/core/browser/country_names.h

 // Copyright 2016 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_COUNTRY_NAMES_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_COUNTRY_NAMES_H_
 
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "third_party/icu/source/common/unicode/locid.h"
 #include "third_party/icu/source/i18n/unicode/coll.h"
 
 namespace base {
 template <typename T>
 struct DefaultSingletonTraits;
 }
 
 namespace autofill {
@@ skipping 37 matching lines @@
       const icu::Collator& collator);
 
   // Returns an ICU collator -- i.e. string comparator -- appropriate for the
   // given |locale|, or null if no collator is available.
   const icu::Collator* GetCollatorForLocale(const icu::Locale& locale);
 
   // The locale object for the application locale string.
   const icu::Locale locale_;
 
   // Collator for the application locale.
-  const scoped_ptr<icu::Collator> collator_;
+  const std::unique_ptr<icu::Collator> collator_;
 
   // Collator for the "en_US" locale, if different from the application
   // locale, null otherwise.
-  const scoped_ptr<icu::Collator> default_collator_;
+  const std::unique_ptr<icu::Collator> default_collator_;
 
   // Maps from common country names, including 2- and 3-letter country codes,
   // to the corresponding 2-letter country codes. The keys are uppercase ASCII
   // strings.
   const std::map<std::string, std::string> common_names_;
 
   // Maps from localized country names (in the application locale) to their
   // corresponding country codes. The keys are ICU collation sort keys
   // corresponding to the target localized country name.
   const std::map<std::string, std::string> localized_names_;
 
   // The same as |localized_names_| but for the "en_US" locale. Empty if
   // "en_US" is the application locale already.
   const std::map<std::string, std::string> default_localized_names_;
 
   DISALLOW_COPY_AND_ASSIGN(CountryNames);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_COUNTRY_NAMES_H_