| Index: chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc
|
| diff --git a/chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc b/chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc
|
| index 0b8642cec34a595d9fcf9f3f8164693424bc1dd1..f735ce8fdc1d6a57865208859683150cc5738660 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc
|
| @@ -9,6 +9,7 @@
|
| #include "base/at_exit.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/memory/singleton.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/single_thread_task_runner.h"
|
| @@ -99,7 +100,7 @@ L10nUtilTest::~L10nUtilTest() {
|
| void L10nUtilTest::SetUp() {
|
| chromeos::input_method::InitializeForTesting(input_manager_);
|
| input_manager_->SetComponentExtensionIMEManager(
|
| - make_scoped_ptr(new ComponentExtensionIMEManager));
|
| + base::WrapUnique(new ComponentExtensionIMEManager));
|
| MachineStatisticsInitializer::GetInstance(); // Ignore result.
|
| }
|
|
|
| @@ -126,14 +127,14 @@ TEST_F(L10nUtilTest, GetUILanguageList) {
|
| SetInputMethods1();
|
|
|
| // This requires initialized StatisticsProvider (see L10nUtilTest()).
|
| - scoped_ptr<base::ListValue> list(GetUILanguageList(NULL, std::string()));
|
| + std::unique_ptr<base::ListValue> list(GetUILanguageList(NULL, std::string()));
|
|
|
| VerifyOnlyUILanguages(*list);
|
| }
|
|
|
| TEST_F(L10nUtilTest, FindMostRelevantLocale) {
|
| base::ListValue available_locales;
|
| - scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
|
| + std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
|
| dict->SetString("value", "de");
|
| available_locales.Append(dict.release());
|
| dict.reset(new base::DictionaryValue);
|
| @@ -190,7 +191,7 @@ TEST_F(L10nUtilTest, GetUILanguageListMulti) {
|
| SetInputMethods2();
|
|
|
| // This requires initialized StatisticsProvider (see L10nUtilTest()).
|
| - scoped_ptr<base::ListValue> list(GetUILanguageList(NULL, std::string()));
|
| + std::unique_ptr<base::ListValue> list(GetUILanguageList(NULL, std::string()));
|
|
|
| VerifyOnlyUILanguages(*list);
|
|
|
| @@ -211,8 +212,8 @@ TEST_F(L10nUtilTest, GetUILanguageListWithMostRelevant) {
|
| most_relevant_language_codes.push_back("nonexistent");
|
|
|
| // This requires initialized StatisticsProvider (see L10nUtilTest()).
|
| - scoped_ptr<base::ListValue>
|
| - list(GetUILanguageList(&most_relevant_language_codes, std::string()));
|
| + std::unique_ptr<base::ListValue> list(
|
| + GetUILanguageList(&most_relevant_language_codes, std::string()));
|
|
|
| VerifyOnlyUILanguages(*list);
|
|
|
|
|