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

Unified Diff: chrome/browser/chromeos/login/users/multi_profile_user_controller_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
Index: chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc
diff --git a/chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc b/chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc
index 405a0847b3ed117be51a781a87c9c1fa706f8f1e..b32eb2cf2f2b09c533b2bfa590ca09805ac6c8f6 100644
--- a/chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc
+++ b/chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc
@@ -6,8 +6,9 @@
#include <stddef.h>
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
@@ -103,7 +104,7 @@ const BehaviorTestCase kBehaviorTestCases[] = {
// we've ensured the profile has been shut down.
policy::PolicyCertVerifier* g_policy_cert_verifier_for_factory = NULL;
-scoped_ptr<KeyedService> TestPolicyCertServiceFactory(
+std::unique_ptr<KeyedService> TestPolicyCertServiceFactory(
content::BrowserContext* context) {
return policy::PolicyCertService::CreateForTesting(
kUsers[0], g_policy_cert_verifier_for_factory,
@@ -211,12 +212,12 @@ class MultiProfileUserControllerTest
}
content::TestBrowserThreadBundle threads_;
- scoped_ptr<policy::PolicyCertVerifier> cert_verifier_;
- scoped_ptr<TestingProfileManager> profile_manager_;
+ std::unique_ptr<policy::PolicyCertVerifier> cert_verifier_;
+ std::unique_ptr<TestingProfileManager> profile_manager_;
FakeChromeUserManager* fake_user_manager_; // Not owned
ScopedUserManagerEnabler user_manager_enabler_;
- scoped_ptr<MultiProfileUserController> controller_;
+ std::unique_ptr<MultiProfileUserController> controller_;
std::vector<TestingProfile*> user_profiles_;

Powered by Google App Engine
This is Rietveld 408576698