Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5233)

Unified Diff: components/autofill/core/common/autofill_l10n_util.h

Issue 1859453002: components/autofill: scoped_ptr -> unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments addressed Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/autofill/core/common/autofill_l10n_util.h
diff --git a/components/autofill/core/common/autofill_l10n_util.h b/components/autofill/core/common/autofill_l10n_util.h
index 27c7247876395bddc0ce6740b93293de37022fb1..ada5bc7f05adc2e4df350fc41fd873f1218b8f17 100644
--- a/components/autofill/core/common/autofill_l10n_util.h
+++ b/components/autofill/core/common/autofill_l10n_util.h
@@ -5,8 +5,9 @@
#ifndef COMPONENTS_AUTOFILL_CORE_COMMON_AUTOFILL_L10N_UTIL_H_
#define COMPONENTS_AUTOFILL_CORE_COMMON_AUTOFILL_L10N_UTIL_H_
+#include <memory>
+
#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"
@@ -16,7 +17,7 @@ namespace l10n {
// Obtains the ICU Collator for this locale. If unsuccessful, attempts to return
// the ICU collator for the English locale. If unsuccessful, returns null.
-scoped_ptr<icu::Collator> GetCollatorForLocale(const icu::Locale& locale);
+std::unique_ptr<icu::Collator> GetCollatorForLocale(const icu::Locale& locale);
// Assists with locale-aware case insensitive string comparisons.
class CaseInsensitiveCompare {
@@ -29,7 +30,7 @@ class CaseInsensitiveCompare {
bool StringsEqual(const base::string16& lhs, const base::string16& rhs) const;
private:
- scoped_ptr<icu::Collator> collator_;
+ std::unique_ptr<icu::Collator> collator_;
DISALLOW_COPY_AND_ASSIGN(CaseInsensitiveCompare);
};

Powered by Google App Engine
This is Rietveld 408576698