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

Unified Diff: chrome/browser/ui/webui/chromeos/login/l10n_util_unittest.cc

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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: 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);

Powered by Google App Engine
This is Rietveld 408576698