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

Unified Diff: chrome/browser/chromeos/policy/consumer_enrollment_handler_factory_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/policy/consumer_enrollment_handler_factory_unittest.cc
diff --git a/chrome/browser/chromeos/policy/consumer_enrollment_handler_factory_unittest.cc b/chrome/browser/chromeos/policy/consumer_enrollment_handler_factory_unittest.cc
index 5532529afefb13521982c72050bdd277a1d8d6b0..c7824747aa026047b15f089f96c528d1b5c40710 100644
--- a/chrome/browser/chromeos/policy/consumer_enrollment_handler_factory_unittest.cc
+++ b/chrome/browser/chromeos/policy/consumer_enrollment_handler_factory_unittest.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/chromeos/policy/consumer_enrollment_handler_factory.h"
+#include "base/memory/ptr_util.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_platform_part.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
@@ -41,7 +42,7 @@ class ConsumerEnrollmentHandlerFactoryTest : public testing::Test {
BrowserPolicyConnectorChromeOS* connector =
g_browser_process->platform_part()->browser_policy_connector_chromeos();
connector->SetConsumerManagementServiceForTesting(
- make_scoped_ptr(fake_service_));
+ base::WrapUnique(fake_service_));
// Set up FakeChromeUserManager.
fake_user_manager_->AddUser(owner_account_id);
@@ -62,7 +63,7 @@ class ConsumerEnrollmentHandlerFactoryTest : public testing::Test {
FakeConsumerManagementService* fake_service_;
chromeos::FakeChromeUserManager* fake_user_manager_;
chromeos::ScopedUserManagerEnabler scoped_user_manager_enabler_;
- scoped_ptr<TestingProfileManager> testing_profile_manager_;
+ std::unique_ptr<TestingProfileManager> testing_profile_manager_;
};
TEST_F(ConsumerEnrollmentHandlerFactoryTest, ServiceIsCreated) {

Powered by Google App Engine
This is Rietveld 408576698