Index: chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest_chromeos.cc |
diff --git a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest_chromeos.cc b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest_chromeos.cc |
index de9428ff7908542c55e0b3eb35daa5660852f087..dc9c48ede9bad00959004409156dc70f726883fc 100644 |
--- a/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest_chromeos.cc |
+++ b/chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest_chromeos.cc |
@@ -2,7 +2,8 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "base/memory/scoped_ptr.h" |
+#include <memory> |
+ |
#include "chrome/browser/apps/app_browsertest_util.h" |
#include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" |
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" |
@@ -46,10 +47,10 @@ class BluetoothLowEnergyApiTestChromeOs : public PlatformAppBrowserTest { |
protected: |
chromeos::FakeChromeUserManager* fake_user_manager_; |
- scoped_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_; |
+ std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_; |
chromeos::ScopedCrosSettingsTestHelper settings_helper_; |
- scoped_ptr<chromeos::FakeOwnerSettingsService> owner_settings_service_; |
+ std::unique_ptr<chromeos::FakeOwnerSettingsService> owner_settings_service_; |
void EnterKioskSession() { |
fake_user_manager_ = new chromeos::FakeChromeUserManager(); |