| Index: chrome/browser/extensions/external_pref_loader.h
|
| diff --git a/chrome/browser/extensions/external_pref_loader.h b/chrome/browser/extensions/external_pref_loader.h
|
| index 2357993f3378eda45fe380c4bb3555130f464361..776cca14f45a9a6191ce526ec6fb9349bddb8efb 100644
|
| --- a/chrome/browser/extensions/external_pref_loader.h
|
| +++ b/chrome/browser/extensions/external_pref_loader.h
|
| @@ -5,11 +5,11 @@
|
| #ifndef CHROME_BROWSER_EXTENSIONS_EXTERNAL_PREF_LOADER_H_
|
| #define CHROME_BROWSER_EXTENSIONS_EXTERNAL_PREF_LOADER_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/scoped_observer.h"
|
| #include "base/values.h"
|
| #include "chrome/browser/extensions/external_loader.h"
|
| @@ -135,7 +135,7 @@ class ExternalTestingLoader : public ExternalLoader {
|
| ~ExternalTestingLoader() override;
|
|
|
| base::FilePath fake_base_path_;
|
| - scoped_ptr<base::DictionaryValue> testing_prefs_;
|
| + std::unique_ptr<base::DictionaryValue> testing_prefs_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ExternalTestingLoader);
|
| };
|
|
|