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

Unified Diff: chrome/browser/chromeos/login/session/user_session_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: iwyu fixes 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/chromeos/login/session/user_session_manager.h
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.h b/chrome/browser/chromeos/login/session/user_session_manager.h
index 31b73672657aa52bbf802d418d20f2bf3f6202e0..2068ce76ecc63391292dcf98700ea9780a9b7993 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.h
+++ b/chrome/browser/chromeos/login/session/user_session_manager.h
@@ -5,11 +5,11 @@
#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_
#define CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_
+#include <memory>
#include <string>
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/singleton.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
@@ -416,7 +416,7 @@ class UserSessionManager
StartSessionType start_session_type_;
// Injected user context for stub authenticator.
- scoped_ptr<UserContext> injected_user_context_;
+ std::unique_ptr<UserContext> injected_user_context_;
// True if the authentication context's cookie jar contains authentication
// cookies from the authentication extension login flow.
@@ -462,15 +462,15 @@ class UserSessionManager
ProfileCompare> default_ime_states_;
// Manages Easy unlock cryptohome keys.
- scoped_ptr<EasyUnlockKeyManager> easy_unlock_key_manager_;
+ std::unique_ptr<EasyUnlockKeyManager> easy_unlock_key_manager_;
bool running_easy_unlock_key_ops_;
base::Closure easy_unlock_key_ops_finished_callback_;
// Whether should fetch token handles, tests may override this value.
bool should_obtain_handles_;
- scoped_ptr<TokenHandleUtil> token_handle_util_;
- scoped_ptr<TokenHandleFetcher> token_handle_fetcher_;
+ std::unique_ptr<TokenHandleUtil> token_handle_util_;
+ std::unique_ptr<TokenHandleFetcher> token_handle_fetcher_;
// Whether should launch browser, tests may override this value.
bool should_launch_browser_;

Powered by Google App Engine
This is Rietveld 408576698