Index: chrome/browser/chromeos/policy/status_uploader_unittest.cc |
diff --git a/chrome/browser/chromeos/policy/status_uploader_unittest.cc b/chrome/browser/chromeos/policy/status_uploader_unittest.cc |
index ef85191392b0fa2f0d4b4d9b9c70fb07e1de6715..8251fd26f4a3c8aff6a746c1754aaf7e9f6ba14d 100644 |
--- a/chrome/browser/chromeos/policy/status_uploader_unittest.cc |
+++ b/chrome/browser/chromeos/policy/status_uploader_unittest.cc |
@@ -6,6 +6,7 @@ |
#include <utility> |
+#include "base/memory/ptr_util.h" |
#include "base/test/test_simple_task_runner.h" |
#include "base/time/time.h" |
#include "chrome/browser/chromeos/policy/device_local_account.h" |
@@ -62,9 +63,9 @@ class MockDeviceStatusCollector : public policy::DeviceStatusCollector { |
// Explicit mock implementation declared here, since gmock::Invoke can't |
// handle returning non-moveable types like scoped_ptr. |
- scoped_ptr<policy::DeviceLocalAccount> GetAutoLaunchedKioskSessionInfo() |
+ std::unique_ptr<policy::DeviceLocalAccount> GetAutoLaunchedKioskSessionInfo() |
override { |
- return make_scoped_ptr(new policy::DeviceLocalAccount( |
+ return base::WrapUnique(new policy::DeviceLocalAccount( |
policy::DeviceLocalAccount::TYPE_KIOSK_APP, "account_id", "app_id", |
"update_url")); |
} |
@@ -130,7 +131,7 @@ class StatusUploaderTest : public testing::Test { |
content::TestBrowserThreadBundle thread_bundle_; |
scoped_refptr<base::TestSimpleTaskRunner> task_runner_; |
chromeos::ScopedCrosSettingsTestHelper settings_helper_; |
- scoped_ptr<MockDeviceStatusCollector> collector_; |
+ std::unique_ptr<MockDeviceStatusCollector> collector_; |
ui::UserActivityDetector detector_; |
MockCloudPolicyClient client_; |
MockDeviceManagementService device_management_service_; |