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

Unified Diff: chrome/browser/chromeos/login/existing_user_controller_browsertest.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
Index: chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
index d72953d48a68ae3074c3e45f1a283d8fc6aa5b8e..5046cfe5a349eca7924e99aef94979b32e2f25fe 100644
--- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
@@ -209,12 +209,12 @@ class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest {
return existing_user_controller()->is_login_in_progress_;
}
- scoped_ptr<ExistingUserController> existing_user_controller_;
+ std::unique_ptr<ExistingUserController> existing_user_controller_;
// |mock_login_display_| is owned by the ExistingUserController, which calls
// CreateLoginDisplay() on the |mock_login_display_host_| to get it.
MockLoginDisplay* mock_login_display_ = nullptr;
- scoped_ptr<MockLoginDisplayHost> mock_login_display_host_;
+ std::unique_ptr<MockLoginDisplayHost> mock_login_display_host_;
// Mock URLFetcher.
MockURLFetcherFactory<SuccessFetcher> factory_;
@@ -442,7 +442,7 @@ class ExistingUserControllerPublicSessionTest
// If both settings have changed we need to wait for both to
// propagate, so check the new values against the old ones.
scoped_refptr<content::MessageLoopRunner> runner1;
- scoped_ptr<CrosSettings::ObserverSubscription> subscription1;
+ std::unique_ptr<CrosSettings::ObserverSubscription> subscription1;
if (!proto.has_device_local_accounts() ||
!proto.device_local_accounts().has_auto_login_id() ||
proto.device_local_accounts().auto_login_id() != user_email) {
@@ -452,7 +452,7 @@ class ExistingUserControllerPublicSessionTest
runner1->QuitClosure());
}
scoped_refptr<content::MessageLoopRunner> runner2;
- scoped_ptr<CrosSettings::ObserverSubscription> subscription2;
+ std::unique_ptr<CrosSettings::ObserverSubscription> subscription2;
if (!proto.has_device_local_accounts() ||
!proto.device_local_accounts().has_auto_login_delay() ||
proto.device_local_accounts().auto_login_delay() != delay) {

Powered by Google App Engine
This is Rietveld 408576698