| Index: content/shell/browser/shell_browser_main_parts.h
|
| diff --git a/content/shell/browser/shell_browser_main_parts.h b/content/shell/browser/shell_browser_main_parts.h
|
| index f8e356f7a3873373384dbba25dd69533dfefc984..a11e961d7ff03f449c97a2d3e193056c81a63472 100644
|
| --- a/content/shell/browser/shell_browser_main_parts.h
|
| +++ b/content/shell/browser/shell_browser_main_parts.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef CONTENT_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_
|
| #define CONTENT_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "build/build_config.h"
|
| #include "content/public/browser/browser_main_parts.h"
|
| #include "content/public/common/main_function_params.h"
|
| @@ -73,17 +74,18 @@ class ShellBrowserMainParts : public BrowserMainParts {
|
|
|
| private:
|
| #if defined(OS_ANDROID)
|
| - scoped_ptr<breakpad::CrashDumpManager> crash_dump_manager_;
|
| + std::unique_ptr<breakpad::CrashDumpManager> crash_dump_manager_;
|
| #endif
|
| - scoped_ptr<net::NetLog> net_log_;
|
| - scoped_ptr<ShellBrowserContext> browser_context_;
|
| - scoped_ptr<ShellBrowserContext> off_the_record_browser_context_;
|
| + std::unique_ptr<net::NetLog> net_log_;
|
| + std::unique_ptr<ShellBrowserContext> browser_context_;
|
| + std::unique_ptr<ShellBrowserContext> off_the_record_browser_context_;
|
|
|
| // For running content_browsertests.
|
| const MainFunctionParams parameters_;
|
| bool run_message_loop_;
|
|
|
| - scoped_ptr<devtools_http_handler::DevToolsHttpHandler> devtools_http_handler_;
|
| + std::unique_ptr<devtools_http_handler::DevToolsHttpHandler>
|
| + devtools_http_handler_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
|
| };
|
|
|