| Index: chrome/browser/chromeos/settings/device_settings_test_helper.h
|
| diff --git a/chrome/browser/chromeos/settings/device_settings_test_helper.h b/chrome/browser/chromeos/settings/device_settings_test_helper.h
|
| index 5bf73f3c8c5e39825b5fc2a56ea22568d6b41edc..d39bff66f30820170376be28558ee420f842c4f0 100644
|
| --- a/chrome/browser/chromeos/settings/device_settings_test_helper.h
|
| +++ b/chrome/browser/chromeos/settings/device_settings_test_helper.h
|
| @@ -6,13 +6,13 @@
|
| #define CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_TEST_HELPER_H_
|
|
|
| #include <map>
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/strings/string_util.h"
|
| #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
|
| @@ -190,9 +190,9 @@ class DeviceSettingsTestBase : public testing::Test {
|
| // Local DeviceSettingsService instance for tests. Avoid using in combination
|
| // with the global instance (DeviceSettingsService::Get()).
|
| DeviceSettingsService device_settings_service_;
|
| - scoped_ptr<TestingProfile> profile_;
|
| + std::unique_ptr<TestingProfile> profile_;
|
|
|
| - scoped_ptr<DBusThreadManagerSetter> dbus_setter_;
|
| + std::unique_ptr<DBusThreadManagerSetter> dbus_setter_;
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(DeviceSettingsTestBase);
|
|
|