| Index: chromecast/browser/pref_service_helper.h
|
| diff --git a/chromecast/browser/pref_service_helper.h b/chromecast/browser/pref_service_helper.h
|
| index 1546cc84428a5dcfc97b791d79db7a9ba765616d..132f16070b45c953647f7c3827616cc7381e857c 100644
|
| --- a/chromecast/browser/pref_service_helper.h
|
| +++ b/chromecast/browser/pref_service_helper.h
|
| @@ -7,11 +7,11 @@
|
| #ifndef CHROMECAST_BROWSER_PREF_SERVICE_HELPER_H_
|
| #define CHROMECAST_BROWSER_PREF_SERVICE_HELPER_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/files/file_path.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/threading/sequenced_worker_pool.h"
|
| #include "base/threading/thread_checker.h"
|
| #include "components/prefs/pref_service.h"
|
| @@ -26,7 +26,7 @@ namespace shell {
|
| class PrefServiceHelper {
|
| public:
|
| // Loads configs from config file. Returns true if successful.
|
| - static scoped_ptr<PrefService> CreatePrefService(
|
| + static std::unique_ptr<PrefService> CreatePrefService(
|
| PrefRegistrySimple* registry);
|
|
|
| private:
|
|
|