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

Unified Diff: chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler_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/settings/chromeos/easy_unlock_settings_handler_unittest.cc
diff --git a/chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler_unittest.cc b/chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler_unittest.cc
index 9b825b0a5b88e886463b09fed98cb295ec490d62..01e4f04d6ccd7d91757c086af03dc0957788aaa2 100644
--- a/chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler_unittest.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler_unittest.cc
@@ -4,7 +4,9 @@
#include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler.h"
-#include "base/memory/scoped_ptr.h"
+#include <memory>
+
+#include "base/memory/ptr_util.h"
#include "chrome/browser/signin/easy_unlock_service.h"
#include "chrome/browser/signin/easy_unlock_service_factory.h"
#include "chrome/test/base/testing_profile.h"
@@ -92,9 +94,9 @@ class TestEasyUnlockSettingsHandler : public EasyUnlockSettingsHandler {
using EasyUnlockSettingsHandler::set_web_ui;
};
-scoped_ptr<KeyedService> CreateEasyUnlockServiceForTest(
+std::unique_ptr<KeyedService> CreateEasyUnlockServiceForTest(
content::BrowserContext* context) {
- return make_scoped_ptr(
+ return base::WrapUnique(
new FakeEasyUnlockService(Profile::FromBrowserContext(context)));
}
@@ -171,12 +173,12 @@ class EasyUnlockSettingsHandlerTest : public testing::Test {
private:
content::TestBrowserThreadBundle thread_bundle_;
- scoped_ptr<TestingProfile> profile_;
+ std::unique_ptr<TestingProfile> profile_;
content::TestWebUI web_ui_;
};
TEST_F(EasyUnlockSettingsHandlerTest, OnlyCreatedWhenEasyUnlockAllowed) {
- scoped_ptr<EasyUnlockSettingsHandler> handler;
+ std::unique_ptr<EasyUnlockSettingsHandler> handler;
content::WebUIDataSource* data_source =
content::WebUIDataSource::Create("test-data-source");
content::WebUIDataSource::Add(profile(), data_source);
@@ -190,7 +192,7 @@ TEST_F(EasyUnlockSettingsHandlerTest, OnlyCreatedWhenEasyUnlockAllowed) {
}
TEST_F(EasyUnlockSettingsHandlerTest, EnabledStatus) {
- scoped_ptr<EasyUnlockSettingsHandler> handler;
+ std::unique_ptr<EasyUnlockSettingsHandler> handler;
handler.reset(new TestEasyUnlockSettingsHandler(profile()));
handler->set_web_ui(web_ui());
@@ -222,7 +224,7 @@ TEST_F(EasyUnlockSettingsHandlerTest, EnabledStatus) {
}
TEST_F(EasyUnlockSettingsHandlerTest, TurnOffFlowStatus) {
- scoped_ptr<EasyUnlockSettingsHandler> handler;
+ std::unique_ptr<EasyUnlockSettingsHandler> handler;
handler.reset(new TestEasyUnlockSettingsHandler(profile()));
handler->set_web_ui(web_ui());

Powered by Google App Engine
This is Rietveld 408576698