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

Unified Diff: chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_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/user_cloud_policy_manager_chromeos_unittest.cc
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc
index 7a7c7726d1fb72fbb9a07780b110decf51432aaf..5dc66be2533905ea4e4c3ae70d8cedb1c6f7e807 100644
--- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc
@@ -100,7 +100,7 @@ class UserCloudPolicyManagerChromeOSTest : public testing::Test {
BuildFakeProfileOAuth2TokenService));
profile_ = profile_manager_->CreateTestingProfile(
chrome::kInitialProfile,
- scoped_ptr<syncable_prefs::PrefServiceSyncable>(),
+ std::unique_ptr<syncable_prefs::PrefServiceSyncable>(),
base::UTF8ToUTF16(""), 0, std::string(), factories);
// Usually the signin Profile and the main Profile are separate, but since
// the signin Profile is an OTR Profile then for this test it suffices to
@@ -170,13 +170,10 @@ class UserCloudPolicyManagerChromeOSTest : public testing::Test {
external_data_manager_->SetPolicyStore(store_);
EXPECT_CALL(*store_, Load());
manager_.reset(new UserCloudPolicyManagerChromeOS(
- scoped_ptr<CloudPolicyStore>(store_),
- scoped_ptr<CloudExternalDataManager>(external_data_manager_),
- base::FilePath(),
- wait_for_fetch,
- base::TimeDelta::FromSeconds(fetch_timeout),
- task_runner_,
- task_runner_,
+ std::unique_ptr<CloudPolicyStore>(store_),
+ std::unique_ptr<CloudExternalDataManager>(external_data_manager_),
+ base::FilePath(), wait_for_fetch,
+ base::TimeDelta::FromSeconds(fetch_timeout), task_runner_, task_runner_,
task_runner_));
manager_->Init(&schema_registry_);
manager_->AddObserver(&observer_);
@@ -336,11 +333,11 @@ class UserCloudPolicyManagerChromeOSTest : public testing::Test {
MockCloudExternalDataManager* external_data_manager_; // Not owned.
scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
SchemaRegistry schema_registry_;
- scoped_ptr<UserCloudPolicyManagerChromeOS> manager_;
- scoped_ptr<UserCloudPolicyTokenForwarder> token_forwarder_;
+ std::unique_ptr<UserCloudPolicyManagerChromeOS> manager_;
+ std::unique_ptr<UserCloudPolicyTokenForwarder> token_forwarder_;
// Required by ProfileHelper to get the signin Profile context.
- scoped_ptr<TestingProfileManager> profile_manager_;
+ std::unique_ptr<TestingProfileManager> profile_manager_;
TestingProfile* profile_;
TestingProfile* signin_profile_;

Powered by Google App Engine
This is Rietveld 408576698