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

Unified Diff: chrome/browser/ui/sync/profile_signin_confirmation_helper_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/sync/profile_signin_confirmation_helper_unittest.cc
diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
index 501de0076045f5e03f728339ead38d8b4d32f412..ce887fdb0aefe7a1c7d4dfcf40b1951dd967a488 100644
--- a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
+++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
@@ -4,13 +4,15 @@
#include "chrome/browser/ui/sync/profile_signin_confirmation_helper.h"
+#include <memory>
+
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/callback.h"
#include "base/command_line.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/strings/string16.h"
@@ -137,7 +139,7 @@ class ProfileSigninConfirmationHelperTest : public testing::Test {
new user_prefs::PrefRegistrySyncable(), new PrefNotifierImpl());
chrome::RegisterUserProfilePrefs(pref_service->registry());
builder.SetPrefService(
- make_scoped_ptr<syncable_prefs::PrefServiceSyncable>(pref_service));
+ base::WrapUnique<syncable_prefs::PrefServiceSyncable>(pref_service));
profile_ = builder.Build();
// Initialize the services we check.
@@ -165,7 +167,7 @@ class ProfileSigninConfirmationHelperTest : public testing::Test {
protected:
content::TestBrowserThreadBundle thread_bundle_;
- scoped_ptr<TestingProfile> profile_;
+ std::unique_ptr<TestingProfile> profile_;
TestingPrefStoreWithCustomReadError* user_prefs_;
BookmarkModel* model_;
« no previous file with comments | « chrome/browser/ui/sync/one_click_signin_sync_starter_unittest.cc ('k') | chrome/browser/ui/sync/sync_promo_ui_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698