Index: third_party/WebKit/Source/platform/v8_inspector/V8InspectorSessionImpl.h |
diff --git a/third_party/WebKit/Source/platform/v8_inspector/V8InspectorSessionImpl.h b/third_party/WebKit/Source/platform/v8_inspector/V8InspectorSessionImpl.h |
index aca0e4ef7bc3dbc8761f06544a386051b79b0a29..907ea3b6582406a0e75f240ac61fa696526145fb 100644 |
--- a/third_party/WebKit/Source/platform/v8_inspector/V8InspectorSessionImpl.h |
+++ b/third_party/WebKit/Source/platform/v8_inspector/V8InspectorSessionImpl.h |
@@ -5,12 +5,11 @@ |
#ifndef V8InspectorSessionImpl_h |
#define V8InspectorSessionImpl_h |
-#include "platform/inspector_protocol/InspectorProtocol.h" |
+#include "platform/v8_inspector/protocol/InspectorProtocol.h" |
#include "platform/v8_inspector/protocol/Runtime.h" |
#include "platform/v8_inspector/public/V8InspectorSession.h" |
#include <v8.h> |
- |
#include <vector> |
namespace v8_inspector { |
@@ -24,7 +23,7 @@ class V8HeapProfilerAgentImpl; |
class V8ProfilerAgentImpl; |
class V8RuntimeAgentImpl; |
-namespace protocol = blink::protocol; |
+using protocol::ErrorString; |
class V8InspectorSessionImpl : public V8InspectorSession { |
PROTOCOL_DISALLOW_COPY(V8InspectorSessionImpl); |
@@ -58,7 +57,7 @@ public: |
void setSkipAllPauses(bool) override; |
void resume() override; |
void stepOver() override; |
- std::unique_ptr<protocol::Array<protocol::Debugger::API::SearchMatch>> searchInTextByLines(const String16& text, const String16& query, bool caseSensitive, bool isRegex) override; |
+ std::vector<std::unique_ptr<protocol::Debugger::API::SearchMatch>> searchInTextByLines(const String16& text, const String16& query, bool caseSensitive, bool isRegex) override; |
void releaseObjectGroup(const String16& objectGroup) override; |
bool unwrapObject(ErrorString*, const String16& objectId, v8::Local<v8::Value>*, v8::Local<v8::Context>*, String16* objectGroup) override; |
std::unique_ptr<protocol::Runtime::API::RemoteObject> wrapObject(v8::Local<v8::Context>, v8::Local<v8::Value>, const String16& groupName) override; |