DevTools: Protocol handler generator for content

BUG=405566

Review URL: https://codereview.chromium.org/508973003

Cr-Commit-Position: refs/heads/master@{#296694}

content/browser/BUILD.gn

@@ -84,6 +84,8 @@ source_set("browser") {
       "$root_gen_dir/ui/resources/grit/webui_resources_map.cc",
       "$root_gen_dir/content/browser/devtools/devtools_protocol_constants.cc",
       "$root_gen_dir/content/browser/devtools/devtools_protocol_constants.h",
+      "$root_gen_dir/content/browser/devtools/protocol/devtools_protocol_handler_impl.cc",
+      "$root_gen_dir/content/browser/devtools/protocol/devtools_protocol_handler_impl.h",
     ], ".")
 
     # Non-iOS deps.

content/browser/devtools/BUILD.gn

@@ -9,6 +9,7 @@ group("resources") {
   deps = [
     ":devtools_resources",
     ":devtools_protocol_constants",
+    ":devtools_protocol_handler",
   ]
 }
 
@@ -56,7 +57,31 @@ action("gen_devtools_protocol_constants") {
   ]
 }
 
+action("gen_devtools_protocol_handler") {
+  visibility = [ ":devtools_protocol_handler" ]
+
+  script = "//content/browser/devtools/protocol/" +
+      "devtools_protocol_handler_generator.py"
+
+  blink_protocol = "//third_party/WebKit/Source/devtools/protocol.json"
+  inputs = [ blink_protocol ]
+
+  outputs = [
+    "$target_gen_dir/protocol/devtools_protocol_handler_impl.cc",
+    "$target_gen_dir/protocol/devtools_protocol_handler_impl.h",
+  ]
+
+  args = [
+    rebase_path(blink_protocol, root_build_dir),
+  ] + rebase_path(outputs, root_build_dir)
+}
+
 source_set("devtools_protocol_constants") {
   visibility = [ ":resources" ]
   sources = get_target_outputs(":gen_devtools_protocol_constants")
 }
+
+source_set("devtools_protocol_handler") {
+  visibility = [ ":resources" ]
+  sources = get_target_outputs(":gen_devtools_protocol_handler")
+}

content/browser/devtools/devtools.gyp

+# Copyright 2014 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'devtools_protocol_handler',
+      'type': 'none',
+      'actions': [
+        {
+          'action_name': 'devtools_protocol_handler',
+          'variables': {
+            'blink_protocol': '../../../third_party/WebKit/Source/devtools/protocol.json',
+            'generator': 'protocol/devtools_protocol_handler_generator.py',
+            'output_cc': '<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/protocol/devtools_protocol_handler_impl.cc',
+            'output_h': '<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/protocol/devtools_protocol_handler_impl.h',
+          },
+          'inputs': [
+            '<(blink_protocol)',
+            '<(generator)',
+          ],
+          'outputs': [
+            '<(output_cc)',
+            '<(output_h)',
+          ],
+          'action':[
+            'python',
+            '<(generator)',
+            '<(blink_protocol)',
+            '<(output_cc)',
+            '<(output_h)',
+          ],
+          'message': 'Generating DevTools protocol browser-side handlers from <(blink_protocol)'
+        },
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '<(SHARED_INTERMEDIATE_DIR)',
+        ]
+      },
+    },
+  ],
+}

content/browser/devtools/protocol/devtools_protocol_client.cc

+// Copyright 2014 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 "content/browser/devtools/protocol/devtools_protocol_client.h"
+
+namespace content {
+
+DevToolsProtocolClient::DevToolsProtocolClient(
+    const EventCallback& event_callback,
+    const ResponseCallback& response_callback)
+    : event_callback_(event_callback),
+      response_callback_(response_callback) {
+}
+
+DevToolsProtocolClient::~DevToolsProtocolClient() {
+}
+
+void DevToolsProtocolClient::SendNotification(const std::string& method,
+                                              base::DictionaryValue* params) {
+  event_callback_.Run(method, params);
+}
+
+void DevToolsProtocolClient::SendAsyncResponse(
+    scoped_refptr<DevToolsProtocol::Response> response) {
+  response_callback_.Run(response);
+}
+
+void DevToolsProtocolClient::SendInvalidParamsResponse(
+    scoped_refptr<DevToolsProtocol::Command> command,
+    const std::string& message) {
+  SendAsyncResponse(command->InvalidParamResponse(message));
+}
+
+void DevToolsProtocolClient::SendInternalErrorResponse(
+    scoped_refptr<DevToolsProtocol::Command> command,
+    const std::string& message) {
+  SendAsyncResponse(command->InternalErrorResponse(message));
+}
+
+void DevToolsProtocolClient::SendServerErrorResponse(
+    scoped_refptr<DevToolsProtocol::Command> command,
+    const std::string& message) {
+  SendAsyncResponse(command->ServerErrorResponse(message));
+}
+
+typedef DevToolsProtocolClient::Response Response;
+
+Response Response::FallThrough() {
+  Response response;
+  response.status_ = ResponseStatus::RESPONSE_STATUS_FALLTHROUGH;
+  return response;
+}
+
+Response Response::OK() {
+  Response response;
+  response.status_ = ResponseStatus::RESPONSE_STATUS_OK;
+  return response;
+}
+
+Response Response::InvalidParams(const std::string& message) {
+  Response response;
+  response.status_ = ResponseStatus::RESPONSE_STATUS_INVALID_PARAMS;
+  response.message_ = message;
+  return response;
+}
+
+Response Response::InternalError(const std::string& message) {
+  Response response;
+  response.status_ = ResponseStatus::RESPONSE_STATUS_INTERNAL_ERROR;
+  response.message_ = message;
+  return response;
+}
+
+Response Response::ServerError(const std::string& message) {
+  Response response;
+  response.status_ = ResponseStatus::RESPONSE_STATUS_SERVER_ERROR;
+  response.message_ = message;
+  return response;
+}
+
+DevToolsProtocolClient::ResponseStatus Response::status() const {
+  return status_;
+}
+
+const std::string& Response::message() const {
+  return message_;
+}
+
+Response::Response() {
+}
+
+}  // namespace content

content/browser/devtools/protocol/devtools_protocol_client.h

+// Copyright 2014 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.
+
+#ifndef CONTENT_BROWSER_DEVTOOLS_PROTOCOL_DEVTOOLS_PROTOCOL_CLIENT_H_
+#define CONTENT_BROWSER_DEVTOOLS_PROTOCOL_DEVTOOLS_PROTOCOL_CLIENT_H_
+
+#include "content/browser/devtools/devtools_protocol.h"
+
+namespace content {
+
+class DevToolsProtocolClient {
+ public:
+  typedef base::Callback<void(const std::string& event,
+                              base::DictionaryValue* params)> EventCallback;
+
+  typedef base::Callback<void(scoped_refptr<DevToolsProtocol::Response>)>
+      ResponseCallback;
+
+  enum ResponseStatus {
+    RESPONSE_STATUS_FALLTHROUGH,
+    RESPONSE_STATUS_OK,
+    RESPONSE_STATUS_INVALID_PARAMS,
+    RESPONSE_STATUS_INTERNAL_ERROR,
+    RESPONSE_STATUS_SERVER_ERROR,
+  };
+
+  struct Response {
+   public:
+    static Response FallThrough();
+    static Response OK();
+    static Response InvalidParams(const std::string& message);
+    static Response InternalError(const std::string& message);
+    static Response ServerError(const std::string& message);
+
+    ResponseStatus status() const;
+    const std::string& message() const;
+
+   private:
+    Response();
+
+    ResponseStatus status_;
+    std::string message_;
+  };
+
+  void SendInvalidParamsResponse(
+      scoped_refptr<DevToolsProtocol::Command> command,
+      const std::string& message);
+  void SendInternalErrorResponse(
+      scoped_refptr<DevToolsProtocol::Command> command,
+      const std::string& message);
+  void SendServerErrorResponse(
+      scoped_refptr<DevToolsProtocol::Command> command,
+      const std::string& message);
+
+ protected:
+  DevToolsProtocolClient(const EventCallback& event_callback,
+                         const ResponseCallback& response_callback);
+
+  virtual ~DevToolsProtocolClient();
+
+  void SendNotification(const std::string& method,
+                        base::DictionaryValue* params);
+
+  void SendAsyncResponse(scoped_refptr<DevToolsProtocol::Response> response);
+
+ private:
+  EventCallback event_callback_;
+  ResponseCallback response_callback_;
+
+  DISALLOW_COPY_AND_ASSIGN(DevToolsProtocolClient);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_BROWSER_DEVTOOLS_PROTOCOL_DEVTOOLS_PROTOCOL_CLIENT_H_

content/browser/devtools/protocol/dom_handler.cc

+// Copyright 2014 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 "content/browser/devtools/protocol/dom_handler.h"
+
+namespace content {
+namespace devtools {
+namespace dom {
+
+typedef DevToolsProtocolClient::Response Response;
+
+DOMHandler::DOMHandler() {
+}
+
+DOMHandler::~DOMHandler() {
+}
+
+Response DOMHandler::SetFileInputFiles(NodeId node_id,
+                                       const std::vector<std::string>& files) {
+  return Response::FallThrough();
+}
+
+}  // namespace dom
+}  // namespace devtools
+}  // namespace content

content/browser/devtools/protocol/dom_handler.h

+// Copyright 2014 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.
+
+#ifndef CONTENT_BROWSER_DEVTOOLS_PROTOCOL_DOM_HANDLER_H_
+#define CONTENT_BROWSER_DEVTOOLS_PROTOCOL_DOM_HANDLER_H_
+
+#include "content/browser/devtools/protocol/devtools_protocol_handler_impl.h"
+
+namespace content {
+namespace devtools {
+namespace dom {
+
+class DOMHandler {
+ public:
+  typedef DevToolsProtocolClient::Response Response;
+
+  DOMHandler();
+  virtual ~DOMHandler();
+
+  Response SetFileInputFiles(NodeId node_id,
+                             const std::vector<std::string>& files);
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(DOMHandler);
+};
+
+}  // namespace dom
+}  // namespace devtools
+}  // namespace content
+
+#endif  // CONTENT_BROWSER_DEVTOOLS_PROTOCOL_DOM_HANDLER_H_

content/browser/devtools/protocol/input_handler.cc

+// Copyright 2014 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 "content/browser/devtools/protocol/input_handler.h"
+
+#include "base/strings/stringprintf.h"
+#include "content/browser/renderer_host/render_view_host_impl.h"
+#include "third_party/WebKit/public/web/WebInputEvent.h"
+
+namespace content {
+namespace devtools {
+namespace input {
+
+typedef DevToolsProtocolClient::Response Response;
+
+InputHandler::InputHandler()
+  : host_(NULL) {
+}
+
+InputHandler::~InputHandler() {
+}
+
+void InputHandler::SetRenderViewHost(RenderViewHostImpl* host) {
+  host_ = host;
+}
+
+Response InputHandler::EmulateTouchFromMouseEvent(const std::string& type,
+                                                  int x,
+                                                  int y,
+                                                  double timestamp,
+                                                  const std::string& button,
+                                                  double* delta_x,
+                                                  double* delta_y,
+                                                  int* modifiers,
+                                                  int* click_count) {
+  blink::WebMouseWheelEvent wheel_event;
+  blink::WebMouseEvent mouse_event;
+  blink::WebMouseEvent* event = &mouse_event;
+
+  if (type == emulate_touch_from_mouse_event::kTypeMousePressed) {
+    event->type = blink::WebInputEvent::MouseDown;
+  } else if (type == emulate_touch_from_mouse_event::kTypeMouseReleased) {
+    event->type = blink::WebInputEvent::MouseUp;
+  } else if (type == emulate_touch_from_mouse_event::kTypeMouseMoved) {
+    event->type = blink::WebInputEvent::MouseMove;
+  } else if (type == emulate_touch_from_mouse_event::kTypeMouseWheel) {
+    if (!delta_x || !delta_y) {
+      return Response::InvalidParams(
+          "'deltaX' and 'deltaY' are expected for mouseWheel event");
+    }
+    wheel_event.deltaX = static_cast<float>(*delta_x);
+    wheel_event.deltaY = static_cast<float>(*delta_y);
+    event = &wheel_event;
+    event->type = blink::WebInputEvent::MouseWheel;
+  } else {
+    return Response::InvalidParams(
+        base::StringPrintf("Unexpected event type '%s'", type.c_str()));
+  }
+
+  if (modifiers) {
+    if (*modifiers & 1)
+      event->modifiers |= blink::WebInputEvent::AltKey;
+    if (*modifiers & 2)
+      event->modifiers |= blink::WebInputEvent::ControlKey;
+    if (*modifiers & 4)
+      event->modifiers |= blink::WebInputEvent::MetaKey;
+    if (*modifiers & 8)
+      event->modifiers |= blink::WebInputEvent::ShiftKey;
+  }
+
+  event->timeStampSeconds = timestamp;
+  event->x = x;
+  event->y = y;
+  event->windowX = x;
+  event->windowY = y;
+  event->globalX = x;
+  event->globalY = y;
+
+  if (click_count)
+    event->clickCount = *click_count;
+
+  if (button == emulate_touch_from_mouse_event::kButtonNone) {
+    event->button = blink::WebMouseEvent::ButtonNone;
+  } else if (button == emulate_touch_from_mouse_event::kButtonLeft) {
+    event->button = blink::WebMouseEvent::ButtonLeft;
+    event->modifiers |= blink::WebInputEvent::LeftButtonDown;
+  } else if (button == emulate_touch_from_mouse_event::kButtonMiddle) {
+    event->button = blink::WebMouseEvent::ButtonMiddle;
+    event->modifiers |= blink::WebInputEvent::MiddleButtonDown;
+  } else if (button == emulate_touch_from_mouse_event::kButtonRight) {
+    event->button = blink::WebMouseEvent::ButtonRight;
+    event->modifiers |= blink::WebInputEvent::RightButtonDown;
+  } else {
+    return Response::InvalidParams(
+        base::StringPrintf("Unexpected mouse button '%s'", button.c_str()));
+  }
+
+  if (!host_)
+    return Response::ServerError("Could not connect to view");
+
+  if (event->type == blink::WebInputEvent::MouseWheel)
+    host_->ForwardWheelEvent(wheel_event);
+  else
+    host_->ForwardMouseEvent(mouse_event);
+  return Response::OK();
+}
+
+}  // namespace input
+}  // namespace devtools
+}  // namespace content

content/browser/devtools/protocol/input_handler.h

+// Copyright 2014 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.
+
+#ifndef CONTENT_BROWSER_DEVTOOLS_PROTOCOL_INPUT_HANDLER_H_
+#define CONTENT_BROWSER_DEVTOOLS_PROTOCOL_INPUT_HANDLER_H_
+
+#include "content/browser/devtools/protocol/devtools_protocol_handler_impl.h"
+
+namespace content {
+
+class RenderViewHostImpl;
+
+namespace devtools {
+namespace input {
+
+class InputHandler {
+ public:
+  typedef DevToolsProtocolClient::Response Response;
+
+  InputHandler();
+  virtual ~InputHandler();
+
+  void SetRenderViewHost(RenderViewHostImpl* host);
+
+  Response EmulateTouchFromMouseEvent(const std::string& type,
+                                      int x,
+                                      int y,
+                                      double timestamp,
+                                      const std::string& button,
+                                      double* delta_x,
+                                      double* delta_y,
+                                      int* modifiers,
+                                      int* click_count);
+
+ private:
+  RenderViewHostImpl* host_;
+
+  DISALLOW_COPY_AND_ASSIGN(InputHandler);
+};
+
+}  // namespace inpue
+}  // namespace devtools
+}  // namespace content
+
+#endif  // CONTENT_BROWSER_DEVTOOLS_PROTOCOL_INPUT_HANDLER_H_

content/browser/devtools/protocol/inspector_handler.cc

+// Copyright 2014 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 "content/browser/devtools/protocol/inspector_handler.h"
+
+namespace content {
+namespace devtools {
+namespace inspector {
+
+InspectorHandler::InspectorHandler() {
+}
+
+InspectorHandler::~InspectorHandler() {
+}
+
+void InspectorHandler::SetClient(scoped_ptr<Client> client) {
+  client_.swap(client);
+}
+
+}  // namespace inspector
+}  // namespace devtools
+}  // namespace content

content/browser/devtools/protocol/inspector_handler.h

+// Copyright 2014 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.
+
+#ifndef CONTENT_BROWSER_DEVTOOLS_PROTOCOL_INSPECTOR_HANDLER_H_
+#define CONTENT_BROWSER_DEVTOOLS_PROTOCOL_INSPECTOR_HANDLER_H_
+
+#include "content/browser/devtools/protocol/devtools_protocol_handler_impl.h"
+
+namespace content {
+namespace devtools {
+namespace inspector {
+
+class InspectorHandler {
+ public:
+  InspectorHandler();
+  virtual ~InspectorHandler();
+
+  void SetClient(scoped_ptr<Client> client);
+
+ private:
+  scoped_ptr<Client> client_;
+
+  DISALLOW_COPY_AND_ASSIGN(InspectorHandler);
+};
+
+}  // namespace inspector
+}  // namespace devtools
+}  // namespace content
+
+#endif  // CONTENT_BROWSER_DEVTOOLS_PROTOCOL_INSPECTOR_HANDLER_H_

content/browser/devtools/protocol/network_handler.cc

+// Copyright 2014 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 "content/browser/devtools/protocol/network_handler.h"
+
+namespace content {
+namespace devtools {
+namespace network {
+
+typedef DevToolsProtocolClient::Response Response;
+
+NetworkHandler::NetworkHandler() {
+}
+
+NetworkHandler::~NetworkHandler() {
+}
+
+Response NetworkHandler::ClearBrowserCache() {
+  return Response::FallThrough();
+}
+
+Response NetworkHandler::ClearBrowserCookies() {
+  return Response::FallThrough();
+}
+
+Response NetworkHandler::CanEmulateNetworkConditions(bool* result) {
+  return Response::FallThrough();
+}
+
+Response NetworkHandler::EmulateNetworkConditions(bool offline,
+                                                  double latency,
+                                                  double download_throughput,
+                                                  double upload_throughput) {
+  return Response::FallThrough();
+}
+
+}  // namespace dom
+}  // namespace devtools
+}  // namespace content

content/browser/devtools/protocol/network_handler.h

+// Copyright 2014 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.
+
+#ifndef CONTENT_BROWSER_DEVTOOLS_PROTOCOL_NETWORK_HANDLER_H_
+#define CONTENT_BROWSER_DEVTOOLS_PROTOCOL_NETWORK_HANDLER_H_
+
+#include "content/browser/devtools/protocol/devtools_protocol_handler_impl.h"
+
+namespace content {
+namespace devtools {
+namespace network {
+
+class NetworkHandler {
+ public:
+  typedef DevToolsProtocolClient::Response Response;
+
+  NetworkHandler();
+  virtual ~NetworkHandler();
+
+  Response ClearBrowserCache();
+  Response ClearBrowserCookies();
+  Response CanEmulateNetworkConditions(bool* result);
+
+  Response EmulateNetworkConditions(bool offline,
+                                    double latency,
+                                    double download_throughput,
+                                    double upload_throughput);
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(NetworkHandler);
+};
+
+}  // namespace network
+}  // namespace devtools
+}  // namespace content
+
+#endif  // CONTENT_BROWSER_DEVTOOLS_PROTOCOL_NETWORK_HANDLER_H_

content/browser/devtools/protocol/page_handler.cc

+// Copyright 2014 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 "content/browser/devtools/protocol/page_handler.h"
+
+#include "base/base64.h"
+#include "content/browser/renderer_host/render_view_host_impl.h"
+
+namespace content {
+namespace devtools {
+namespace page {
+
+typedef DevToolsProtocolClient::Response Response;
+
+PageHandler::PageHandler()
+    : weak_factory_(this) {
+}
+
+PageHandler::~PageHandler() {
+}
+
+void PageHandler::SetRenderViewHost(RenderViewHostImpl* host) {
+  host_ = host;
+}
+
+void PageHandler::SetClient(scoped_ptr<Client> client) {
+  client_.swap(client);
+}
+
+Response PageHandler::Enable() {
+  return Response::FallThrough();
+}
+
+Response PageHandler::Disable() {
+  return Response::FallThrough();
+}
+
+Response PageHandler::Reload(const bool* ignoreCache,
+                             const std::string* script_to_evaluate_on_load,
+                             const std::string* script_preprocessor) {
+  return Response::FallThrough();
+}
+
+Response PageHandler::Navigate(const std::string& url,
+                               FrameId* frame_id) {
+  return Response::FallThrough();
+}
+
+Response PageHandler::GetNavigationHistory(
+    int* current_index,
+    std::vector<NavigationEntry>* entries) {
+  return Response::FallThrough();
+}
+
+Response PageHandler::NavigateToHistoryEntry(int entry_id) {
+  return Response::FallThrough();
+}
+
+Response PageHandler::SetTouchEmulationEnabled(bool enabled) {
+  return Response::FallThrough();
+}
+
+scoped_refptr<DevToolsProtocol::Response> PageHandler::CaptureScreenshot(
+    scoped_refptr<DevToolsProtocol::Command> command) {
+  if (!host_ || !host_->GetView())
+    return command->InternalErrorResponse("Could not connect to view");
+
+  host_->GetSnapshotFromBrowser(
+      base::Bind(&PageHandler::ScreenshotCaptured,
+          weak_factory_.GetWeakPtr(), command));
+  return command->AsyncResponsePromise();
+}
+
+Response PageHandler::CanScreencast(bool* result) {
+  return Response::FallThrough();
+}
+
+Response PageHandler::CanEmulate(bool* result) {
+  return Response::FallThrough();
+}
+
+Response PageHandler::StartScreencast(const std::string* format,
+                                      const int* quality,
+                                      const int* max_width,
+                                      const int* max_height) {
+  return Response::FallThrough();
+}
+
+Response PageHandler::StopScreencast() {
+  return Response::FallThrough();
+}
+
+Response PageHandler::HandleJavaScriptDialog(bool accept,
+                                             const std::string* prompt_text) {
+  return Response::FallThrough();
+}
+
+scoped_refptr<DevToolsProtocol::Response> PageHandler::QueryUsageAndQuota(
+    const std::string& security_origin,
+    scoped_refptr<DevToolsProtocol::Command> command) {
+  return NULL;
+}
+
+Response PageHandler::SetColorPickerEnabled(bool enabled) {
+  return Response::FallThrough();
+}
+
+void PageHandler::ScreenshotCaptured(
+    scoped_refptr<DevToolsProtocol::Command> command,
+    const unsigned char* png_data,
+    size_t png_size) {
+  if (!png_data || !png_size) {
+    client_->SendInternalErrorResponse(command,
+                                       "Unable to capture screenshot");
+    return;
+  }
+
+  std::string base_64_data;
+  base::Base64Encode(
+      base::StringPiece(reinterpret_cast<const char*>(png_data), png_size),
+      &base_64_data);
+
+  CaptureScreenshotResponse response;
+  response.set_data(base_64_data);
+  client_->SendCaptureScreenshotResponse(command, response);
+}
+
+}  // namespace page
+}  // namespace devtools
+}  // namespace content

content/browser/devtools/protocol/page_handler.h

+// Copyright 2014 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.
+
+#ifndef CONTENT_BROWSER_DEVTOOLS_PROTOCOL_PAGE_HANDLER_H_
+#define CONTENT_BROWSER_DEVTOOLS_PROTOCOL_PAGE_HANDLER_H_
+
+#include "base/memory/weak_ptr.h"
+#include "content/browser/devtools/protocol/devtools_protocol_handler_impl.h"
+
+namespace content {
+
+class RenderViewHostImpl;
+
+namespace devtools {
+namespace page {
+
+class PageHandler {
+ public:
+  typedef DevToolsProtocolClient::Response Response;
+
+  PageHandler();
+  virtual ~PageHandler();
+
+  void SetRenderViewHost(RenderViewHostImpl* host);
+  void SetClient(scoped_ptr<Client> client);
+
+  Response Enable();
+  Response Disable();
+
+  Response Reload(const bool* ignoreCache,
+                  const std::string* script_to_evaluate_on_load,
+                  const std::string* script_preprocessor);
+
+  Response Navigate(const std::string& url, FrameId* frame_id);
+
+  Response GetNavigationHistory(int* current_index,
+                                std::vector<NavigationEntry>* entries);
+
+  Response NavigateToHistoryEntry(int entry_id);
+  Response SetTouchEmulationEnabled(bool enabled);
+
+  scoped_refptr<DevToolsProtocol::Response> CaptureScreenshot(
+      scoped_refptr<DevToolsProtocol::Command> command);
+
+  Response CanScreencast(bool* result);
+  Response CanEmulate(bool* result);
+
+  Response StartScreencast(const std::string* format,
+                           const int* quality,
+                           const int* max_width,
+                           const int* max_height);
+
+  Response StopScreencast();
+  Response HandleJavaScriptDialog(bool accept, const std::string* prompt_text);
+
+  scoped_refptr<DevToolsProtocol::Response> QueryUsageAndQuota(
+      const std::string& security_origin,
+      scoped_refptr<DevToolsProtocol::Command> command);
+
+  Response SetColorPickerEnabled(bool enabled);
+
+ private:
+  RenderViewHostImpl* host_;
+  scoped_ptr<Client> client_;
+  base::WeakPtrFactory<PageHandler> weak_factory_;
+
+  void ScreenshotCaptured(
+      scoped_refptr<DevToolsProtocol::Command> command,
+      const unsigned char* png_data,
+      size_t png_size);
+
+  DISALLOW_COPY_AND_ASSIGN(PageHandler);
+};
+
+}  // namespace page
+}  // namespace devtools
+}  // namespace content
+
+#endif  // CONTENT_BROWSER_DEVTOOLS_PROTOCOL_PAGE_HANDLER_H_

content/browser/devtools/protocol/power_handler.cc

+// Copyright 2014 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 "content/browser/devtools/protocol/power_handler.h"
+
+namespace content {
+namespace devtools {
+namespace power {
+
+typedef DevToolsProtocolClient::Response Response;
+
+PowerHandler::PowerHandler() {
+}
+
+PowerHandler::~PowerHandler() {
+}
+
+void PowerHandler::SetClient(scoped_ptr<Client> client) {
+  client_.swap(client);
+}
+
+Response PowerHandler::Start() {
+  return Response::FallThrough();
+}
+
+Response PowerHandler::End() {
+  return Response::FallThrough();
+}
+
+Response PowerHandler::CanProfilePower(bool* result) {
+  return Response::FallThrough();
+}
+
+Response PowerHandler::GetAccuracyLevel(std::string* result) {
+  return Response::FallThrough();
+}
+
+}  // namespace power
+}  // namespace devtools
+}  // namespace content

content/browser/devtools/protocol/power_handler.h

+// Copyright 2014 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.
+
+#ifndef CONTENT_BROWSER_DEVTOOLS_PROTOCOL_POWER_HANDLER_H_
+#define CONTENT_BROWSER_DEVTOOLS_PROTOCOL_POWER_HANDLER_H_
+
+#include "content/browser/devtools/protocol/devtools_protocol_handler_impl.h"
+
+namespace content {
+namespace devtools {
+namespace power {
+
+class PowerHandler {
+ public:
+  typedef DevToolsProtocolClient::Response Response;
+
+  PowerHandler();
+  virtual ~PowerHandler();
+
+  void SetClient(scoped_ptr<Client> client);
+
+  Response Start();
+  Response End();
+  Response CanProfilePower(bool* result);
+  Response GetAccuracyLevel(std::string* result);
+
+ private:
+  scoped_ptr<Client> client_;
+
+  DISALLOW_COPY_AND_ASSIGN(PowerHandler);
+};
+
+}  // namespace power
+}  // namespace devtools
+}  // namespace content
+
+#endif  // CONTENT_BROWSER_DEVTOOLS_PROTOCOL_POWER_HANDLER_H_

content/browser/devtools/protocol/tracing_handler.cc

+// Copyright 2014 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 "content/browser/devtools/protocol/tracing_handler.h"
+
+namespace content {
+namespace devtools {
+namespace tracing {
+
+typedef DevToolsProtocolClient::Response Response;
+
+TracingHandler::TracingHandler() {
+}
+
+TracingHandler::~TracingHandler() {
+}
+
+void TracingHandler::SetClient(scoped_ptr<Client> client) {
+  client_.swap(client);
+}
+
+Response TracingHandler::Start(const std::string& categories,
+                               const std::string& options,
+                               const double* buffer_usage_reporting_interval) {
+  return Response::FallThrough();
+}
+
+Response TracingHandler::End() {
+  return Response::FallThrough();
+}
+
+scoped_refptr<DevToolsProtocol::Response> TracingHandler::GetCategories(
+    scoped_refptr<DevToolsProtocol::Command> command) {
+  return NULL;
+}
+
+}  // namespace tracing
+}  // namespace devtools
+}  // namespace content

content/browser/devtools/protocol/tracing_handler.h

+// Copyright 2014 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.
+
+#ifndef CONTENT_BROWSER_DEVTOOLS_PROTOCOL_TRACING_HANDLER_H_
+#define CONTENT_BROWSER_DEVTOOLS_PROTOCOL_TRACING_HANDLER_H_
+
+#include "content/browser/devtools/protocol/devtools_protocol_handler_impl.h"
+
+namespace content {
+namespace devtools {
+namespace tracing {
+
+class TracingHandler {
+ public:
+  typedef DevToolsProtocolClient::Response Response;
+
+  TracingHandler();
+  virtual ~TracingHandler();
+
+  void SetClient(scoped_ptr<Client> client);
+
+  Response Start(const std::string& categories,
+                 const std::string& options,
+                 const double* buffer_usage_reporting_interval);
+
+  Response End();
+
+  scoped_refptr<DevToolsProtocol::Response> GetCategories(
+      scoped_refptr<DevToolsProtocol::Command> command);
+
+ private:
+  scoped_ptr<Client> client_;
+
+  DISALLOW_COPY_AND_ASSIGN(TracingHandler);
+};
+
+}  // namespace tracing
+}  // namespace devtools
+}  // namespace content
+
+#endif  // CONTENT_BROWSER_DEVTOOLS_PROTOCOL_TRACING_HANDLER_H_

content/browser/devtools/protocol/worker_handler.cc

+// Copyright 2014 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 "content/browser/devtools/protocol/worker_handler.h"
+
+namespace content {
+namespace devtools {
+namespace worker {
+
+typedef DevToolsProtocolClient::Response Response;
+typedef DevToolsProtocolClient::ResponseStatus ResponseStatus;
+
+WorkerHandler::WorkerHandler() {
+}
+
+WorkerHandler::~WorkerHandler() {
+}
+
+void WorkerHandler::SetClient(scoped_ptr<Client> client) {
+  client_.swap(client);
+}
+
+Response WorkerHandler::DisconnectFromWorker(int worker_id) {
+  return Response::FallThrough();
+}
+
+}  // namespace worker
+}  // namespace devtools
+}  // namespace content

content/browser/devtools/protocol/worker_handler.h

+// Copyright 2014 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.
+
+#ifndef CONTENT_BROWSER_DEVTOOLS_PROTOCOL_WORKER_HANDLER_H_
+#define CONTENT_BROWSER_DEVTOOLS_PROTOCOL_WORKER_HANDLER_H_
+
+#include "content/browser/devtools/protocol/devtools_protocol_handler_impl.h"
+
+namespace content {
+namespace devtools {
+namespace worker {
+
+class WorkerHandler {
+ public:
+  typedef DevToolsProtocolClient::Response Response;
+
+  WorkerHandler();
+  virtual ~WorkerHandler();
+
+  void SetClient(scoped_ptr<Client> client);
+
+  Response DisconnectFromWorker(int worker_id);
+
+ private:
+  scoped_ptr<Client> client_;
+
+  DISALLOW_COPY_AND_ASSIGN(WorkerHandler);
+};
+
+}  // namespace worker
+}  // namespace devtools
+}  // namespace content
+
+#endif  // CONTENT_BROWSER_DEVTOOLS_PROTOCOL_WORKER_HANDLER_H_

content/browser/devtools/render_view_devtools_agent_host.cc

@@ -13,6 +13,7 @@
 #include "content/browser/devtools/devtools_protocol.h"
 #include "content/browser/devtools/devtools_protocol_constants.h"
 #include "content/browser/devtools/devtools_tracing_handler.h"
+#include "content/browser/devtools/protocol/devtools_protocol_handler_impl.h"
 #include "content/browser/devtools/renderer_overrides_handler.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
@@ -109,15 +110,21 @@ void RenderViewDevToolsAgentHost::OnCancelPendingNavigation(
 
 RenderViewDevToolsAgentHost::RenderViewDevToolsAgentHost(RenderViewHost* rvh)
     : render_view_host_(NULL),
+      input_handler_(new devtools::input::InputHandler()),
+      page_handler_(new devtools::page::PageHandler()),
+      handler_impl_(new DevToolsProtocolHandlerImpl()),
       overrides_handler_(new RendererOverridesHandler()),
       tracing_handler_(
           new DevToolsTracingHandler(DevToolsTracingHandler::Renderer)),
       power_handler_(new DevToolsPowerHandler()),
       reattaching_(false) {
+  handler_impl_->SetInputHandler(input_handler_.get());
+  handler_impl_->SetPageHandler(page_handler_.get());
   SetRenderViewHost(rvh);
   DevToolsProtocol::Notifier notifier(base::Bind(
       &RenderViewDevToolsAgentHost::OnDispatchOnInspectorFrontend,
       base::Unretained(this)));
+  handler_impl_->SetNotifier(notifier);
   overrides_handler_->SetNotifier(notifier);
   tracing_handler_->SetNotifier(notifier);
   power_handler_->SetNotifier(notifier);
@@ -156,6 +163,8 @@ void RenderViewDevToolsAgentHost::DispatchProtocolMessage(
       overridden_response = tracing_handler_->HandleCommand(command);
     if (!overridden_response.get())
       overridden_response = power_handler_->HandleCommand(command);
+    if (!overridden_response.get())
+      overridden_response = handler_impl_->HandleCommand(command);
     if (overridden_response.get()) {
       if (!overridden_response->is_async_promise())
         OnDispatchOnInspectorFrontend(overridden_response->Serialize());
@@ -354,6 +363,8 @@ void RenderViewDevToolsAgentHost::SetRenderViewHost(RenderViewHost* rvh) {
 
   WebContentsObserver::Observe(WebContents::FromRenderViewHost(rvh));
   overrides_handler_->SetRenderViewHost(render_view_host_);
+  input_handler_->SetRenderViewHost(render_view_host_);
+  page_handler_->SetRenderViewHost(render_view_host_);
 
   registrar_.Add(
       this,
@@ -369,6 +380,8 @@ void RenderViewDevToolsAgentHost::ClearRenderViewHost() {
       content::Source<RenderWidgetHost>(render_view_host_));
   render_view_host_ = NULL;
   overrides_handler_->ClearRenderViewHost();
+  input_handler_->SetRenderViewHost(NULL);
+  page_handler_->SetRenderViewHost(NULL);
 }
 
 void RenderViewDevToolsAgentHost::DisconnectWebContents() {

content/browser/devtools/render_view_devtools_agent_host.h

@@ -11,6 +11,8 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/devtools/ipc_devtools_agent_host.h"
+#include "content/browser/devtools/protocol/input_handler.h"
+#include "content/browser/devtools/protocol/page_handler.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
@@ -23,6 +25,7 @@ class CompositorFrameMetadata;
 namespace content {
 
 class DevToolsPowerHandler;
+class DevToolsProtocolHandlerImpl;
 class DevToolsTracingHandler;
 class RendererOverridesHandler;
 class RenderViewHost;
@@ -104,6 +107,9 @@ class CONTENT_EXPORT RenderViewDevToolsAgentHost
   void InnerClientDetachedFromRenderer();
 
   RenderViewHostImpl* render_view_host_;
+  scoped_ptr<devtools::input::InputHandler> input_handler_;
+  scoped_ptr<devtools::page::PageHandler> page_handler_;
+  scoped_ptr<DevToolsProtocolHandlerImpl> handler_impl_;
   scoped_ptr<RendererOverridesHandler> overrides_handler_;
   scoped_ptr<DevToolsTracingHandler> tracing_handler_;
   scoped_ptr<DevToolsPowerHandler> power_handler_;

content/browser/devtools/renderer_overrides_handler.cc

@@ -134,11 +134,6 @@ RendererOverridesHandler::RendererOverridesHandler()
       base::Bind(
           &RendererOverridesHandler::PageNavigateToHistoryEntry,
           base::Unretained(this)));
-  RegisterCommandHandler(
-      devtools::Page::captureScreenshot::kName,
-      base::Bind(
-          &RendererOverridesHandler::PageCaptureScreenshot,
-          base::Unretained(this)));
   RegisterCommandHandler(
       devtools::Page::setTouchEmulationEnabled::kName,
       base::Bind(
@@ -174,11 +169,6 @@ RendererOverridesHandler::RendererOverridesHandler()
       base::Bind(
           &RendererOverridesHandler::PageSetColorPickerEnabled,
           base::Unretained(this)));
-  RegisterCommandHandler(
-      devtools::Input::emulateTouchFromMouseEvent::kName,
-      base::Bind(
-          &RendererOverridesHandler::InputEmulateTouchFromMouseEvent,
-          base::Unretained(this)));
   mouse_event_callback_ = base::Bind(
       &RendererOverridesHandler::HandleMouseEvent,
       base::Unretained(this));
@@ -517,40 +507,6 @@ RendererOverridesHandler::PageNavigateToHistoryEntry(
   return command->InternalErrorResponse("No WebContents to navigate");
 }
 
-scoped_refptr<DevToolsProtocol::Response>
-RendererOverridesHandler::PageCaptureScreenshot(
-    scoped_refptr<DevToolsProtocol::Command> command) {
-  if (!host_ || !host_->GetView())
-    return command->InternalErrorResponse("Could not connect to view");
-
-  host_->GetSnapshotFromBrowser(
-      base::Bind(&RendererOverridesHandler::ScreenshotCaptured,
-          weak_factory_.GetWeakPtr(), command));
-  return command->AsyncResponsePromise();
-}
-
-void RendererOverridesHandler::ScreenshotCaptured(
-    scoped_refptr<DevToolsProtocol::Command> command,
-    const unsigned char* png_data,
-    size_t png_size) {
-  if (!png_data || !png_size) {
-    SendAsyncResponse(
-        command->InternalErrorResponse("Unable to capture screenshot"));
-    return;
-  }
-
-  std::string base_64_data;
-  base::Base64Encode(
-      base::StringPiece(reinterpret_cast<const char*>(png_data), png_size),
-      &base_64_data);
-
-  base::DictionaryValue* response = new base::DictionaryValue();
-  response->SetString(devtools::Page::screencastFrame::kParamData,
-                      base_64_data);
-
-  SendAsyncResponse(command->SuccessResponse(response));
-}
-
 scoped_refptr<DevToolsProtocol::Response>
 RendererOverridesHandler::PageSetTouchEmulationEnabled(
     scoped_refptr<DevToolsProtocol::Command> command) {
@@ -1189,137 +1145,6 @@ void RendererOverridesHandler::UpdateColorPickerCursor() {
   host_->SetCursor(cursor);
 }
 
-// Input agent handlers  ------------------------------------------------------
-
-scoped_refptr<DevToolsProtocol::Response>
-RendererOverridesHandler::InputEmulateTouchFromMouseEvent(
-    scoped_refptr<DevToolsProtocol::Command> command) {
-  if (!screencast_command_.get())
-    return command->InternalErrorResponse("Screencast should be turned on");
-
-  base::DictionaryValue* params = command->params();
-  if (!params)
-    return command->NoSuchMethodErrorResponse();
-
-  std::string type;
-  if (!params->GetString(
-          devtools::Input::emulateTouchFromMouseEvent::kParamType,
-          &type)) {
-    return command->InvalidParamResponse(
-        devtools::Input::emulateTouchFromMouseEvent::kParamType);
-  }
-
-  blink::WebMouseWheelEvent wheel_event;
-  blink::WebMouseEvent mouse_event;
-  blink::WebMouseEvent* event = &mouse_event;
-
-  if (type ==
-      devtools::Input::emulateTouchFromMouseEvent::Type::kEnumMousePressed) {
-    event->type = WebInputEvent::MouseDown;
-  } else if (type ==
-      devtools::Input::emulateTouchFromMouseEvent::Type::kEnumMouseReleased) {
-    event->type = WebInputEvent::MouseUp;
-  } else if (type ==
-      devtools::Input::emulateTouchFromMouseEvent::Type::kEnumMouseMoved) {
-    event->type = WebInputEvent::MouseMove;
-  } else if (type ==
-      devtools::Input::emulateTouchFromMouseEvent::Type::kEnumMouseWheel) {
-    double deltaX = 0;
-    double deltaY = 0;
-    if (!params->GetDouble(
-            devtools::Input::emulateTouchFromMouseEvent::kParamDeltaX,
-            &deltaX)) {
-      return command->InvalidParamResponse(
-          devtools::Input::emulateTouchFromMouseEvent::kParamDeltaX);
-    }
-    if (!params->GetDouble(
-            devtools::Input::emulateTouchFromMouseEvent::kParamDeltaY,
-            &deltaY)) {
-      return command->InvalidParamResponse(
-          devtools::Input::emulateTouchFromMouseEvent::kParamDeltaY);
-    }
-    wheel_event.deltaX = static_cast<float>(deltaX);
-    wheel_event.deltaY = static_cast<float>(deltaY);
-    event = &wheel_event;
-    event->type = WebInputEvent::MouseWheel;
-  } else {
-    return command->InvalidParamResponse(
-        devtools::Input::emulateTouchFromMouseEvent::kParamType);
-  }
-
-  int modifiers = 0;
-  if (params->GetInteger(
-          devtools::Input::emulateTouchFromMouseEvent::kParamModifiers,
-          &modifiers)) {
-    if (modifiers & 1)
-      event->modifiers |= WebInputEvent::AltKey;
-    if (modifiers & 2)
-      event->modifiers |= WebInputEvent::ControlKey;
-    if (modifiers & 4)
-      event->modifiers |= WebInputEvent::MetaKey;
-    if (modifiers & 8)
-      event->modifiers |= WebInputEvent::ShiftKey;
-  }
-
-  params->GetDouble(
-      devtools::Input::emulateTouchFromMouseEvent::kParamTimestamp,
-      &event->timeStampSeconds);
-
-  if (!params->GetInteger(devtools::Input::emulateTouchFromMouseEvent::kParamX,
-                          &event->x)) {
-    return command->InvalidParamResponse(
-        devtools::Input::emulateTouchFromMouseEvent::kParamX);
-  }
-
-  if (!params->GetInteger(devtools::Input::emulateTouchFromMouseEvent::kParamY,
-                          &event->y)) {
-    return command->InvalidParamResponse(
-        devtools::Input::emulateTouchFromMouseEvent::kParamY);
-  }
-
-  event->windowX = event->x;
-  event->windowY = event->y;
-  event->globalX = event->x;
-  event->globalY = event->y;
-
-  params->GetInteger(
-      devtools::Input::emulateTouchFromMouseEvent::kParamClickCount,
-      &event->clickCount);
-
-  std::string button;
-  if (!params->GetString(
-          devtools::Input::emulateTouchFromMouseEvent::kParamButton,
-          &button)) {
-    return command->InvalidParamResponse(
-        devtools::Input::emulateTouchFromMouseEvent::kParamButton);
-  }
-
-  if (button == "none") {
-    event->button = WebMouseEvent::ButtonNone;
-  } else if (button == "left") {
-    event->button = WebMouseEvent::ButtonLeft;
-    event->modifiers |= WebInputEvent::LeftButtonDown;
-  } else if (button == "middle") {
-    event->button = WebMouseEvent::ButtonMiddle;
-    event->modifiers |= WebInputEvent::MiddleButtonDown;
-  } else if (button == "right") {
-    event->button = WebMouseEvent::ButtonRight;
-    event->modifiers |= WebInputEvent::RightButtonDown;
-  } else {
-    return command->InvalidParamResponse(
-        devtools::Input::emulateTouchFromMouseEvent::kParamButton);
-  }
-
-  if (!host_)
-    return command->InternalErrorResponse("Could not connect to view");
-
-  if (event->type == WebInputEvent::MouseWheel)
-    host_->ForwardWheelEvent(wheel_event);
-  else
-    host_->ForwardMouseEvent(mouse_event);
-  return command->SuccessResponse(NULL);
-}
-
 void RendererOverridesHandler::UpdateTouchEventEmulationState() {
   if (!host_)
     return;

content/browser/devtools/renderer_overrides_handler.h

@@ -82,8 +82,6 @@ class CONTENT_EXPORT RendererOverridesHandler
       scoped_refptr<DevToolsProtocol::Command> command);
   scoped_refptr<DevToolsProtocol::Response> PageSetTouchEmulationEnabled(
       scoped_refptr<DevToolsProtocol::Command> command);
-  scoped_refptr<DevToolsProtocol::Response> PageCaptureScreenshot(
-      scoped_refptr<DevToolsProtocol::Command> command);
   scoped_refptr<DevToolsProtocol::Response> PageCanEmulate(
       scoped_refptr<DevToolsProtocol::Command> command);
   scoped_refptr<DevToolsProtocol::Response> PageCanScreencast(
@@ -97,11 +95,6 @@ class CONTENT_EXPORT RendererOverridesHandler
   scoped_refptr<DevToolsProtocol::Response> PageSetColorPickerEnabled(
       scoped_refptr<DevToolsProtocol::Command>);
 
-  void ScreenshotCaptured(
-      scoped_refptr<DevToolsProtocol::Command> command,
-      const unsigned char* png_data,
-      size_t png_size);
-
   void ScreencastFrameCaptured(
       const std::string& format,
       int quality,
@@ -121,10 +114,6 @@ class CONTENT_EXPORT RendererOverridesHandler
   bool HandleMouseEvent(const blink::WebMouseEvent& event);
   void UpdateColorPickerCursor();
 
-  // Input domain.
-  scoped_refptr<DevToolsProtocol::Response> InputEmulateTouchFromMouseEvent(
-      scoped_refptr<DevToolsProtocol::Command> command);
-
   void UpdateTouchEventEmulationState();
 
   RenderViewHostImpl* host_;

content/content_browser.gypi

@@ -457,6 +457,24 @@
       'browser/devtools/embedded_worker_devtools_agent_host.h',
       'browser/devtools/embedded_worker_devtools_manager.cc',
       'browser/devtools/embedded_worker_devtools_manager.h',
+      'browser/devtools/protocol/devtools_protocol_client.cc',
+      'browser/devtools/protocol/devtools_protocol_client.h',
+      'browser/devtools/protocol/dom_handler.cc',
+      'browser/devtools/protocol/dom_handler.h',
+      'browser/devtools/protocol/input_handler.cc',
+      'browser/devtools/protocol/input_handler.h',
+      'browser/devtools/protocol/inspector_handler.cc',
+      'browser/devtools/protocol/inspector_handler.h',
+      'browser/devtools/protocol/network_handler.cc',
+      'browser/devtools/protocol/network_handler.h',
+      'browser/devtools/protocol/page_handler.cc',
+      'browser/devtools/protocol/page_handler.h',
+      'browser/devtools/protocol/power_handler.cc',
+      'browser/devtools/protocol/power_handler.h',
+      'browser/devtools/protocol/tracing_handler.cc',
+      'browser/devtools/protocol/tracing_handler.h',
+      'browser/devtools/protocol/worker_handler.cc',
+      'browser/devtools/protocol/worker_handler.h',
       'browser/devtools/render_view_devtools_agent_host.cc',
       'browser/devtools/render_view_devtools_agent_host.h',
       'browser/devtools/renderer_overrides_handler.cc',
@@ -1375,6 +1393,9 @@
       # These files are generated by devtools_protocol_constants_generator.py.
       '<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/devtools_protocol_constants.cc',
       '<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/devtools_protocol_constants.h',
+      # These files are generated by devtools_protocol_handler_generator.py.
+      '<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/protocol/devtools_protocol_handler_impl.cc',
+      '<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/protocol/devtools_protocol_handler_impl.h',
     ],
     'android_browser_sources': [
       'browser/android/java/gin_java_bound_object.cc',
@@ -1608,6 +1629,7 @@
         'app/resources/content_resources.gyp:content_resources',
         'app/strings/content_strings.gyp:content_strings',
         'browser/devtools/devtools_resources.gyp:devtools_resources',
+        'browser/devtools/devtools.gyp:devtools_protocol_handler',
         'content_common_mojo_bindings',
         '../cc/cc.gyp:cc',
         '../cc/cc.gyp:cc_surfaces',