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

Unified Diff: chrome/browser/chromeos/policy/device_cloud_policy_store_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/device_cloud_policy_store_chromeos_unittest.cc
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc
index 5e03baecb0d01f05fbbf439a3fca970f19fd72d8..2246d5ce00b0485d6e273f6895fa2c8596dc5ddf 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos_unittest.cc
@@ -4,12 +4,12 @@
#include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h"
+#include <memory>
#include <string>
#include <vector>
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/run_loop.h"
#include "base/thread_task_runner_handle.h"
#include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
@@ -58,7 +58,7 @@ class DeviceCloudPolicyStoreChromeOSTest
DeviceSettingsTestBase::SetUp();
dbus_setter_->SetCryptohomeClient(
- scoped_ptr<chromeos::CryptohomeClient>(fake_cryptohome_client_));
+ std::unique_ptr<chromeos::CryptohomeClient>(fake_cryptohome_client_));
base::RunLoop loop;
EnterpriseInstallAttributes::LockResult result;
@@ -141,9 +141,9 @@ class DeviceCloudPolicyStoreChromeOSTest
ScopedTestingLocalState local_state_;
chromeos::FakeCryptohomeClient* fake_cryptohome_client_;
- scoped_ptr<EnterpriseInstallAttributes> install_attributes_;
+ std::unique_ptr<EnterpriseInstallAttributes> install_attributes_;
- scoped_ptr<DeviceCloudPolicyStoreChromeOS> store_;
+ std::unique_ptr<DeviceCloudPolicyStoreChromeOS> store_;
private:
DISALLOW_COPY_AND_ASSIGN(DeviceCloudPolicyStoreChromeOSTest);

Powered by Google App Engine
This is Rietveld 408576698