| Index: content/browser/webui/web_ui_impl.h
|
| diff --git a/content/browser/webui/web_ui_impl.h b/content/browser/webui/web_ui_impl.h
|
| index 1c812a5660c943951308c92265801e5681e9e37b..a372a40e679bddecc3734ac33351dc3ca14b5b01 100644
|
| --- a/content/browser/webui/web_ui_impl.h
|
| +++ b/content/browser/webui/web_ui_impl.h
|
| @@ -6,11 +6,11 @@
|
| #define CONTENT_BROWSER_WEBUI_WEB_UI_IMPL_H_
|
|
|
| #include <map>
|
| +#include <memory>
|
| #include <set>
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/scoped_vector.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "content/public/browser/web_ui.h"
|
| @@ -117,7 +117,7 @@ class CONTENT_EXPORT WebUIImpl : public WebUI,
|
| // is used.
|
| const std::string frame_name_;
|
|
|
| - scoped_ptr<WebUIController> controller_;
|
| + std::unique_ptr<WebUIController> controller_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(WebUIImpl);
|
| };
|
|
|