DevTools: migrate from OwnPtr to std::unique_ptr for inspector protocol classes.

third_party/WebKit/Source/platform/v8_inspector/V8InspectorSessionImpl.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/v8_inspector/V8InspectorSessionImpl.h"
 
 #include "platform/inspector_protocol/Parser.h"
 #include "platform/v8_inspector/InjectedScript.h"
 #include "platform/v8_inspector/InspectedContext.h"
 #include "platform/v8_inspector/RemoteObjectId.h"
 #include "platform/v8_inspector/V8DebuggerAgentImpl.h"
 #include "platform/v8_inspector/V8DebuggerImpl.h"
 #include "platform/v8_inspector/V8HeapProfilerAgentImpl.h"
 #include "platform/v8_inspector/V8ProfilerAgentImpl.h"
 #include "platform/v8_inspector/V8RuntimeAgentImpl.h"
 #include "platform/v8_inspector/public/V8ContextInfo.h"
 #include "platform/v8_inspector/public/V8DebuggerClient.h"
 
 namespace blink {
 
 const char V8InspectorSession::backtraceObjectGroup[] = "backtrace";
 
 // static
 bool V8InspectorSession::isV8ProtocolMethod(const String16& method)
 {
     return method.startWith("Debugger.") || method.startWith("HeapProfiler.") || method.startWith("Profiler.") || method.startWith("Runtime.");
 }
 
-PassOwnPtr<V8InspectorSessionImpl> V8InspectorSessionImpl::create(V8DebuggerImpl* debugger, int contextGroupId, V8InspectorSessionClient* client, const String16* state)
+std::unique_ptr<V8InspectorSessionImpl> V8InspectorSessionImpl::create(V8DebuggerImpl* debugger, int contextGroupId, V8InspectorSessionClient* client, const String16* state)
 {
-    return adoptPtr(new V8InspectorSessionImpl(debugger, contextGroupId, client, state));
+    return wrapUnique(new V8InspectorSessionImpl(debugger, contextGroupId, client, state));
 }
 
 V8InspectorSessionImpl::V8InspectorSessionImpl(V8DebuggerImpl* debugger, int contextGroupId, V8InspectorSessionClient* client, const String16* savedState)
     : m_contextGroupId(contextGroupId)
     , m_debugger(debugger)
     , m_client(client)
     , m_customObjectFormatterEnabled(false)
     , m_instrumentationCounter(0)
-    , m_frontend(adoptPtr(new protocol::Frontend(client)))
+    , m_frontend(new protocol::Frontend(client))
     , m_dispatcher(protocol::Dispatcher::create(client))
     , m_state(nullptr)
     , m_runtimeAgent(nullptr)
     , m_debuggerAgent(nullptr)
     , m_heapProfilerAgent(nullptr)
     , m_profilerAgent(nullptr)
 {
     if (savedState) {
-        OwnPtr<protocol::Value> state = protocol::parseJSON(*savedState);
+        std::unique_ptr<protocol::Value> state = protocol::parseJSON(*savedState);
         if (state)
             m_state = protocol::DictionaryValue::cast(std::move(state));
         if (!m_state)
             m_state = protocol::DictionaryValue::create();
     } else {
         m_state = protocol::DictionaryValue::create();
     }
 
-    m_runtimeAgent = adoptPtr(new V8RuntimeAgentImpl(this, protocol::Frontend::Runtime::from(m_frontend.get()), agentState("Runtime")));
+    m_runtimeAgent = wrapUnique(new V8RuntimeAgentImpl(this, protocol::Frontend::Runtime::from(m_frontend.get()), agentState("Runtime")));
     m_dispatcher->registerAgent(static_cast<protocol::Backend::Runtime*>(m_runtimeAgent.get()));
 
-    m_debuggerAgent = adoptPtr(new V8DebuggerAgentImpl(this, protocol::Frontend::Debugger::from(m_frontend.get()), agentState("Debugger")));
+    m_debuggerAgent = wrapUnique(new V8DebuggerAgentImpl(this, protocol::Frontend::Debugger::from(m_frontend.get()), agentState("Debugger")));
     m_dispatcher->registerAgent(static_cast<protocol::Backend::Debugger*>(m_debuggerAgent.get()));
 
-    m_heapProfilerAgent = adoptPtr(new V8HeapProfilerAgentImpl(this, protocol::Frontend::HeapProfiler::from(m_frontend.get()), agentState("HeapProfiler")));
+    m_heapProfilerAgent = wrapUnique(new V8HeapProfilerAgentImpl(this, protocol::Frontend::HeapProfiler::from(m_frontend.get()), agentState("HeapProfiler")));
     m_dispatcher->registerAgent(static_cast<protocol::Backend::HeapProfiler*>(m_heapProfilerAgent.get()));
 
-    m_profilerAgent = adoptPtr(new V8ProfilerAgentImpl(this, protocol::Frontend::Profiler::from(m_frontend.get()), agentState("Profiler")));
+    m_profilerAgent = wrapUnique(new V8ProfilerAgentImpl(this, protocol::Frontend::Profiler::from(m_frontend.get()), agentState("Profiler")));
     m_dispatcher->registerAgent(static_cast<protocol::Backend::Profiler*>(m_profilerAgent.get()));
 
     if (savedState) {
         m_runtimeAgent->restore();
         m_debuggerAgent->restore();
         m_heapProfilerAgent->restore();
         m_profilerAgent->restore();
     }
 }
 
 V8InspectorSessionImpl::~V8InspectorSessionImpl()
 {
     m_dispatcher->clearFrontend();
-    m_dispatcher.clear();
+    m_dispatcher.reset();
 
     ErrorString errorString;
     m_profilerAgent->disable(&errorString);
     m_heapProfilerAgent->disable(&errorString);
     m_debuggerAgent->disable(&errorString);
     m_runtimeAgent->disable(&errorString);
 
-    m_frontend.clear();
+    m_frontend.reset();
     discardInjectedScripts();
     m_debugger->disconnect(this);
 }
 
 protocol::DictionaryValue* V8InspectorSessionImpl::agentState(const String16& name)
 {
     protocol::DictionaryValue* state = m_state->getObject(name);
     if (!state) {
-        OwnPtr<protocol::DictionaryValue> newState = protocol::DictionaryValue::create();
+        std::unique_ptr<protocol::DictionaryValue> newState = protocol::DictionaryValue::create();
         state = newState.get();
         m_state->setObject(name, std::move(newState));
     }
     return state;
 }
 
 void V8InspectorSessionImpl::reset()
 {
     m_debuggerAgent->reset();
     m_runtimeAgent->reset();
@@ skipping 62 matching lines @@
         if (contexts && contexts->contains(key)) {
             InjectedScript* injectedScript = contexts->get(key)->getInjectedScript();
             if (injectedScript)
                 injectedScript->releaseObjectGroup(objectGroup); // This may destroy some contexts.
         }
     }
 }
 
 v8::Local<v8::Value> V8InspectorSessionImpl::findObject(ErrorString* errorString, const String16& objectId, v8::Local<v8::Context>* context, String16* groupName)
 {
-    OwnPtr<RemoteObjectId> remoteId = RemoteObjectId::parse(errorString, objectId);
+    std::unique_ptr<RemoteObjectId> remoteId = RemoteObjectId::parse(errorString, objectId);
     if (!remoteId)
         return v8::Local<v8::Value>();
     InjectedScript* injectedScript = findInjectedScript(errorString, remoteId.get());
     if (!injectedScript)
         return v8::Local<v8::Value>();
     v8::Local<v8::Value> objectValue;
     injectedScript->findObject(errorString, *remoteId, &objectValue);
     if (objectValue.IsEmpty())
         return v8::Local<v8::Value>();
     if (context)
         *context = injectedScript->context()->context();
     if (groupName)
         *groupName = injectedScript->objectGroupName(*remoteId);
     return objectValue;
 }
 
-PassOwnPtr<protocol::Runtime::RemoteObject> V8InspectorSessionImpl::wrapObject(v8::Local<v8::Context> context, v8::Local<v8::Value> value, const String16& groupName, bool generatePreview)
+std::unique_ptr<protocol::Runtime::RemoteObject> V8InspectorSessionImpl::wrapObject(v8::Local<v8::Context> context, v8::Local<v8::Value> value, const String16& groupName, bool generatePreview)
 {
     ErrorString errorString;
     InjectedScript* injectedScript = findInjectedScript(&errorString, V8Debugger::contextId(context));
     if (!injectedScript)
         return nullptr;
     return injectedScript->wrapObject(&errorString, value, groupName, false, generatePreview);
 }
 
-PassOwnPtr<protocol::Runtime::RemoteObject> V8InspectorSessionImpl::wrapTable(v8::Local<v8::Context> context, v8::Local<v8::Value> table, v8::Local<v8::Value> columns)
+std::unique_ptr<protocol::Runtime::RemoteObject> V8InspectorSessionImpl::wrapTable(v8::Local<v8::Context> context, v8::Local<v8::Value> table, v8::Local<v8::Value> columns)
 {
     ErrorString errorString;
     InjectedScript* injectedScript = findInjectedScript(&errorString, V8Debugger::contextId(context));
     if (!injectedScript)
         return nullptr;
     return injectedScript->wrapTable(table, columns);
 }
 
 void V8InspectorSessionImpl::setCustomObjectFormatterEnabled(bool enabled)
 {
@@ skipping 30 matching lines @@
 void V8InspectorSessionImpl::dispatchProtocolMessage(const String16& message)
 {
     m_dispatcher->dispatch(message);
 }
 
 String16 V8InspectorSessionImpl::stateJSON()
 {
     return m_state->toJSONString();
 }
 
-void V8InspectorSessionImpl::addInspectedObject(PassOwnPtr<V8InspectorSession::Inspectable> inspectable)
+void V8InspectorSessionImpl::addInspectedObject(std::unique_ptr<V8InspectorSession::Inspectable> inspectable)
 {
     m_inspectedObjects.prepend(std::move(inspectable));
     while (m_inspectedObjects.size() > kInspectedObjectBufferSize)
         m_inspectedObjects.removeLast();
 }
 
 V8InspectorSession::Inspectable* V8InspectorSessionImpl::inspectedObject(unsigned num)
 {
     if (num >= m_inspectedObjects.size())
         return nullptr;
     return m_inspectedObjects[num];
 }
 
-void V8InspectorSessionImpl::schedulePauseOnNextStatement(const String16& breakReason, PassOwnPtr<protocol::DictionaryValue> data)
+void V8InspectorSessionImpl::schedulePauseOnNextStatement(const String16& breakReason, std::unique_ptr<protocol::DictionaryValue> data)
 {
     m_debuggerAgent->schedulePauseOnNextStatement(breakReason, std::move(data));
 }
 
 void V8InspectorSessionImpl::cancelPauseOnNextStatement()
 {
     m_debuggerAgent->cancelPauseOnNextStatement();
 }
 
-void V8InspectorSessionImpl::breakProgram(const String16& breakReason, PassOwnPtr<protocol::DictionaryValue> data)
+void V8InspectorSessionImpl::breakProgram(const String16& breakReason, std::unique_ptr<protocol::DictionaryValue> data)
 {
     m_debuggerAgent->breakProgram(breakReason, std::move(data));
 }
 
-void V8InspectorSessionImpl::breakProgramOnException(const String16& breakReason, PassOwnPtr<protocol::DictionaryValue> data)
+void V8InspectorSessionImpl::breakProgramOnException(const String16& breakReason, std::unique_ptr<protocol::DictionaryValue> data)
 {
     m_debuggerAgent->breakProgramOnException(breakReason, std::move(data));
 }
 
 void V8InspectorSessionImpl::setSkipAllPauses(bool skip)
 {
     ErrorString errorString;
     m_debuggerAgent->setSkipAllPauses(&errorString, skip);
 }
 
@@ skipping 28 matching lines @@
 {
     m_debuggerAgent->asyncTaskFinished(task);
 }
 
 void V8InspectorSessionImpl::allAsyncTasksCanceled()
 {
     m_debuggerAgent->allAsyncTasksCanceled();
 }
 
 } // namespace blink