chrome/browser/chromeos/login/users/user_manager_unittest.cc - Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/users/user_manager_unittest.cc

Issue 1870793002: Convert //chrome/browser/chromeos 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

« no previous file with comments | « chrome/browser/chromeos/login/users/supervised_user_manager_impl.h ('k') | chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/users/user_manager_unittest.cc

diff --git a/chrome/browser/chromeos/login/users/user_manager_unittest.cc b/chrome/browser/chromeos/login/users/user_manager_unittest.cc

index 88e20b7f2cf7601cd6a5e97644171157287977fa..7c340fdf308b9114fb8183eed04026f1e964032d 100644

--- a/chrome/browser/chromeos/login/users/user_manager_unittest.cc

+++ b/chrome/browser/chromeos/login/users/user_manager_unittest.cc

@@ -4,11 +4,11 @@

#include <cstdlib>

#include <cstring>

+#include <memory>

#include "base/command_line.h"

#include "base/files/file_util.h"

#include "base/files/scoped_temp_dir.h"

-#include "base/memory/scoped_ptr.h"

#include "base/run_loop.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h"

@@ -147,9 +147,9 @@ class UserManagerTest : public testing::Test {

content::TestBrowserThreadBundle thread_bundle_;

ScopedCrosSettingsTestHelper settings_helper_;

- scoped_ptr<ScopedTestingLocalState> local_state_;

+ std::unique_ptr<ScopedTestingLocalState> local_state_;

- scoped_ptr<ScopedUserManagerEnabler> user_manager_enabler_;

+ std::unique_ptr<ScopedUserManagerEnabler> user_manager_enabler_;

base::ScopedTempDir temp_dir_;

};