Index: content/browser/devtools/render_frame_devtools_agent_host.h |
diff --git a/content/browser/devtools/render_frame_devtools_agent_host.h b/content/browser/devtools/render_frame_devtools_agent_host.h |
index 24d05358ad98f48176a741f57abd25cf9f596cbe..beedd88b913e90439bb6c4c581b9fb0fb5e50d39 100644 |
--- a/content/browser/devtools/render_frame_devtools_agent_host.h |
+++ b/content/browser/devtools/render_frame_devtools_agent_host.h |
@@ -6,10 +6,10 @@ |
#define CONTENT_BROWSER_DEVTOOLS_RENDER_FRAME_DEVTOOLS_AGENT_HOST_H_ |
#include <map> |
+#include <memory> |
#include "base/compiler_specific.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "build/build_config.h" |
#include "content/browser/devtools/devtools_agent_host_impl.h" |
#include "content/common/content_export.h" |
@@ -142,28 +142,28 @@ class CONTENT_EXPORT RenderFrameDevToolsAgentHost |
class FrameHostHolder; |
- scoped_ptr<FrameHostHolder> current_; |
- scoped_ptr<FrameHostHolder> pending_; |
+ std::unique_ptr<FrameHostHolder> current_; |
+ std::unique_ptr<FrameHostHolder> pending_; |
// Stores per-host state between DisconnectWebContents and ConnectWebContents. |
- scoped_ptr<FrameHostHolder> disconnected_; |
- |
- scoped_ptr<devtools::dom::DOMHandler> dom_handler_; |
- scoped_ptr<devtools::input::InputHandler> input_handler_; |
- scoped_ptr<devtools::inspector::InspectorHandler> inspector_handler_; |
- scoped_ptr<devtools::io::IOHandler> io_handler_; |
- scoped_ptr<devtools::network::NetworkHandler> network_handler_; |
- scoped_ptr<devtools::page::PageHandler> page_handler_; |
- scoped_ptr<devtools::security::SecurityHandler> security_handler_; |
- scoped_ptr<devtools::service_worker::ServiceWorkerHandler> |
+ std::unique_ptr<FrameHostHolder> disconnected_; |
+ |
+ std::unique_ptr<devtools::dom::DOMHandler> dom_handler_; |
+ std::unique_ptr<devtools::input::InputHandler> input_handler_; |
+ std::unique_ptr<devtools::inspector::InspectorHandler> inspector_handler_; |
+ std::unique_ptr<devtools::io::IOHandler> io_handler_; |
+ std::unique_ptr<devtools::network::NetworkHandler> network_handler_; |
+ std::unique_ptr<devtools::page::PageHandler> page_handler_; |
+ std::unique_ptr<devtools::security::SecurityHandler> security_handler_; |
+ std::unique_ptr<devtools::service_worker::ServiceWorkerHandler> |
service_worker_handler_; |
- scoped_ptr<devtools::tracing::TracingHandler> tracing_handler_; |
- scoped_ptr<devtools::emulation::EmulationHandler> emulation_handler_; |
- scoped_ptr<DevToolsFrameTraceRecorder> frame_trace_recorder_; |
+ std::unique_ptr<devtools::tracing::TracingHandler> tracing_handler_; |
+ std::unique_ptr<devtools::emulation::EmulationHandler> emulation_handler_; |
+ std::unique_ptr<DevToolsFrameTraceRecorder> frame_trace_recorder_; |
#if defined(OS_ANDROID) |
- scoped_ptr<PowerSaveBlockerImpl> power_save_blocker_; |
+ std::unique_ptr<PowerSaveBlockerImpl> power_save_blocker_; |
#endif |
- scoped_ptr<DevToolsProtocolHandler> protocol_handler_; |
+ std::unique_ptr<DevToolsProtocolHandler> protocol_handler_; |
bool current_frame_crashed_; |
// PlzNavigate |