| Index: chrome/browser/extensions/api/omnibox/omnibox_api.h
|
| diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.h b/chrome/browser/extensions/api/omnibox/omnibox_api.h
|
| index 9c36a7c1b3168b98fabc771cacfa3b9b34982b39..d49ecc1f2809752154bc031920537ed0f69c5c9a 100644
|
| --- a/chrome/browser/extensions/api/omnibox/omnibox_api.h
|
| +++ b/chrome/browser/extensions/api/omnibox/omnibox_api.h
|
| @@ -5,11 +5,11 @@
|
| #ifndef CHROME_BROWSER_EXTENSIONS_API_OMNIBOX_OMNIBOX_API_H_
|
| #define CHROME_BROWSER_EXTENSIONS_API_OMNIBOX_OMNIBOX_API_H_
|
|
|
| +#include <memory>
|
| #include <set>
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/scoped_observer.h"
|
| #include "base/strings/string16.h"
|
| #include "chrome/browser/extensions/chrome_extension_function.h"
|
| @@ -142,7 +142,7 @@ class OmniboxAPI : public BrowserContextKeyedAPI,
|
| ExtensionIconManager omnibox_icon_manager_;
|
| ExtensionIconManager omnibox_popup_icon_manager_;
|
|
|
| - scoped_ptr<TemplateURLService::Subscription> template_url_sub_;
|
| + std::unique_ptr<TemplateURLService::Subscription> template_url_sub_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(OmniboxAPI);
|
| };
|
|
|