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

Side by Side Diff: chrome/browser/chromeos/login/users/scoped_test_user_manager.h

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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_SCOPED_TEST_USER_MANAGER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_SCOPED_TEST_USER_MANAGER_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_SCOPED_TEST_USER_MANAGER_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_SCOPED_TEST_USER_MANAGER_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h"
10 11
11 namespace chromeos { 12 namespace chromeos {
12 13
13 class ChromeUserManager; 14 class ChromeUserManager;
14 15
15 // Helper class for unit tests. Initializes the UserManager singleton on 16 // Helper class for unit tests. Initializes the UserManager singleton on
16 // construction and tears it down again on destruction. 17 // construction and tears it down again on destruction.
17 class ScopedTestUserManager { 18 class ScopedTestUserManager {
18 public: 19 public:
19 ScopedTestUserManager(); 20 ScopedTestUserManager();
20 ~ScopedTestUserManager(); 21 ~ScopedTestUserManager();
21 22
22 private: 23 private:
23 scoped_ptr<ChromeUserManager> chrome_user_manager_; 24 std::unique_ptr<ChromeUserManager> chrome_user_manager_;
24 25
25 DISALLOW_COPY_AND_ASSIGN(ScopedTestUserManager); 26 DISALLOW_COPY_AND_ASSIGN(ScopedTestUserManager);
26 }; 27 };
27 28
28 } // namespace chromeos 29 } // namespace chromeos
29 30
30 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_SCOPED_TEST_USER_MANAGER_H_ 31 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_SCOPED_TEST_USER_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698