| Index: chrome/browser/ui/webui/options/cookies_view_handler.h
|
| diff --git a/chrome/browser/ui/webui/options/cookies_view_handler.h b/chrome/browser/ui/webui/options/cookies_view_handler.h
|
| index fcfefd4cf110a19502847d9d7f29e888f4af4bf5..4e440ae49c1febf55bd551bf9eaab5d22bb43726 100644
|
| --- a/chrome/browser/ui/webui/options/cookies_view_handler.h
|
| +++ b/chrome/browser/ui/webui/options/cookies_view_handler.h
|
| @@ -5,9 +5,10 @@
|
| #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_COOKIES_VIEW_HANDLER_H_
|
| #define CHROME_BROWSER_UI_WEBUI_OPTIONS_COOKIES_VIEW_HANDLER_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/browsing_data/cookies_tree_model.h"
|
| #include "chrome/browser/ui/webui/options/options_ui.h"
|
|
|
| @@ -65,12 +66,12 @@ class CookiesViewHandler : public OptionsPageUIHandler,
|
| void ReloadCookies(const base::ListValue* args);
|
|
|
| // The Cookies Tree model
|
| - scoped_ptr<CookiesTreeModel> cookies_tree_model_;
|
| + std::unique_ptr<CookiesTreeModel> cookies_tree_model_;
|
|
|
| // Flag to indicate whether there is a batch update in progress.
|
| bool batch_update_;
|
|
|
| - scoped_ptr<CookiesTreeModelUtil> model_util_;
|
| + std::unique_ptr<CookiesTreeModelUtil> model_util_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(CookiesViewHandler);
|
| };
|
|
|