Index: chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc |
diff --git a/chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc b/chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc |
index 5d6a5fd4ca1602fa92155271b16d7e5d6dd09215..d69fcbc14ebe6031233fc31fa1ff0ec8455f3e9b 100644 |
--- a/chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc |
+++ b/chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc |
@@ -75,7 +75,7 @@ class EnterpriseDeviceAttributesTest : |
chromeos::FakeSessionManagerClient* fake_session_manager_client = |
new chromeos::FakeSessionManagerClient; |
chromeos::DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient( |
- scoped_ptr<chromeos::SessionManagerClient>( |
+ std::unique_ptr<chromeos::SessionManagerClient>( |
fake_session_manager_client)); |
std::set<std::string> device_affiliation_ids; |
@@ -95,7 +95,7 @@ class EnterpriseDeviceAttributesTest : |
affiliated_account_id_.GetUserEmail(), user_affiliation_ids); |
// Set up fake install attributes. |
- scoped_ptr<policy::StubEnterpriseInstallAttributes> attributes( |
+ std::unique_ptr<policy::StubEnterpriseInstallAttributes> attributes( |
new policy::StubEnterpriseInstallAttributes()); |
attributes->SetRegistrationUser(affiliated_account_id_.GetUserEmail()); |
@@ -140,7 +140,7 @@ class EnterpriseDeviceAttributesTest : |
GURL update_manifest_url(net::URLRequestMockHTTPJob::GetMockUrl( |
update_manifest_path.MaybeAsASCII())); |
- scoped_ptr<base::ListValue> forcelist(new base::ListValue); |
+ std::unique_ptr<base::ListValue> forcelist(new base::ListValue); |
forcelist->AppendString(base::StringPrintf( |
"%s;%s", kTestExtensionID, update_manifest_url.spec().c_str())); |