| Index: chrome/browser/extensions/api/font_settings/font_settings_api.h
|
| diff --git a/chrome/browser/extensions/api/font_settings/font_settings_api.h b/chrome/browser/extensions/api/font_settings/font_settings_api.h
|
| index 5423991306c98168cd4abf3070b3d870445e74c0..4f62fc187a9d68bceb0d64d75e9f05d635101081 100644
|
| --- a/chrome/browser/extensions/api/font_settings/font_settings_api.h
|
| +++ b/chrome/browser/extensions/api/font_settings/font_settings_api.h
|
| @@ -8,10 +8,10 @@
|
| #ifndef CHROME_BROWSER_EXTENSIONS_API_FONT_SETTINGS_FONT_SETTINGS_API_H_
|
| #define CHROME_BROWSER_EXTENSIONS_API_FONT_SETTINGS_FONT_SETTINGS_API_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/extensions/chrome_extension_function.h"
|
| #include "components/prefs/pref_change_registrar.h"
|
| #include "components/prefs/pref_service.h"
|
| @@ -95,7 +95,7 @@ class FontSettingsAPI : public BrowserContextKeyedAPI {
|
| }
|
| static const bool kServiceIsNULLWhileTesting = true;
|
|
|
| - scoped_ptr<FontSettingsEventRouter> font_settings_event_router_;
|
| + std::unique_ptr<FontSettingsEventRouter> font_settings_event_router_;
|
| };
|
|
|
| // fontSettings.clearFont API function.
|
| @@ -149,7 +149,7 @@ class FontSettingsGetFontListFunction : public ChromeAsyncExtensionFunction {
|
| bool RunAsync() override;
|
|
|
| private:
|
| - void FontListHasLoaded(scoped_ptr<base::ListValue> list);
|
| + void FontListHasLoaded(std::unique_ptr<base::ListValue> list);
|
| bool CopyFontsToResult(base::ListValue* fonts);
|
| };
|
|
|
|
|