DevTools: Enable network emulation on Service Workers

content/browser/devtools/render_frame_devtools_agent_host.cc

 // Copyright (c) 2012 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/render_frame_devtools_agent_host.h"
 
 #include "base/basictypes.h"
-#include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/devtools/devtools_frame_trace_recorder.h"
 #include "content/browser/devtools/devtools_manager.h"
 #include "content/browser/devtools/protocol/devtools_protocol_handler.h"
 #include "content/browser/devtools/protocol/dom_handler.h"
 #include "content/browser/devtools/protocol/emulation_handler.h"
 #include "content/browser/devtools/protocol/input_handler.h"
 #include "content/browser/devtools/protocol/inspector_handler.h"
 #include "content/browser/devtools/protocol/network_handler.h"
 #include "content/browser/devtools/protocol/page_handler.h"
 #include "content/browser/devtools/protocol/power_handler.h"
 #include "content/browser/devtools/protocol/service_worker_handler.h"
 #include "content/browser/devtools/protocol/tracing_handler.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/content_browser_client.h"
-#include "content/public/browser/devtools_manager_delegate.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_widget_host_iterator.h"
 #include "content/public/browser/web_contents_delegate.h"
 
 #if defined(OS_ANDROID)
 #include "content/browser/power_save_blocker_impl.h"
 #include "content/public/browser/render_widget_host_view.h"
 #endif
 
@@ skipping 97 matching lines @@
       inspector_handler_(new devtools::inspector::InspectorHandler()),
       network_handler_(new devtools::network::NetworkHandler()),
       page_handler_(new devtools::page::PageHandler()),
       power_handler_(new devtools::power::PowerHandler()),
       service_worker_handler_(
           new devtools::service_worker::ServiceWorkerHandler()),
       tracing_handler_(new devtools::tracing::TracingHandler(
           devtools::tracing::TracingHandler::Renderer)),
       emulation_handler_(new devtools::emulation::EmulationHandler(
           page_handler_.get())),
-      protocol_handler_(new DevToolsProtocolHandler(
-          base::Bind(&RenderFrameDevToolsAgentHost::DispatchOnInspectorFrontend,
-                     base::Unretained(this)))),
       frame_trace_recorder_(new DevToolsFrameTraceRecorder()),
       reattaching_(false) {
   DevToolsProtocolDispatcher* dispatcher = protocol_handler_->dispatcher();
   dispatcher->SetDOMHandler(dom_handler_.get());
   dispatcher->SetEmulationHandler(emulation_handler_.get());
   dispatcher->SetInputHandler(input_handler_.get());
   dispatcher->SetInspectorHandler(inspector_handler_.get());
   dispatcher->SetNetworkHandler(network_handler_.get());
   dispatcher->SetPageHandler(page_handler_.get());
   dispatcher->SetPowerHandler(power_handler_.get());
   dispatcher->SetServiceWorkerHandler(service_worker_handler_.get());
   dispatcher->SetTracingHandler(tracing_handler_.get());
   SetRenderFrameHost(rfh);
   g_instances.Get().push_back(this);
   AddRef();  // Balanced in RenderFrameHostDestroyed.
   DevToolsManager::GetInstance()->AgentHostChanged(this);
 }
 
 BrowserContext* RenderFrameDevToolsAgentHost::GetBrowserContext() {
   WebContents* contents = web_contents();
   return contents ? contents->GetBrowserContext() : nullptr;
 }
 
 WebContents* RenderFrameDevToolsAgentHost::GetWebContents() {
   return web_contents();
 }
 
-void RenderFrameDevToolsAgentHost::DispatchProtocolMessage(
-    const std::string& message) {
-  scoped_ptr<base::DictionaryValue> command =
-      protocol_handler_->ParseCommand(message);
-  if (!command)
-    return;

[pfeldman, 2015/03/23 09:59:01]

You are changing this semantics since the new code will be sending malformed
commands over IPC. It was returning here originally.

[Kunihiko Sakamoto, 2015/03/23 10:23:58]

Ah right, thanks for pointing it out.

-
-  DevToolsManagerDelegate* delegate =
-      DevToolsManager::GetInstance()->delegate();
-  if (delegate) {
-    scoped_ptr<base::DictionaryValue> response(
-        delegate->HandleCommand(this, command.get()));
-    if (response) {
-      std::string json_response;
-      base::JSONWriter::Write(response.get(), &json_response);
-      DispatchOnInspectorFrontend(json_response);
-      return;
-    }
-  }
-
-  if (protocol_handler_->HandleOptionalCommand(command.Pass()))
-    return;
-
-  IPCDevToolsAgentHost::DispatchProtocolMessage(message);
-}
-
 void RenderFrameDevToolsAgentHost::SendMessageToAgent(IPC::Message* msg) {
   if (!render_frame_host_)
     return;
   msg->set_routing_id(render_frame_host_->GetRoutingID());
   render_frame_host_->Send(msg);
 }
 
 void RenderFrameDevToolsAgentHost::OnClientAttached() {
   if (!render_frame_host_)
     return;
@@ skipping 334 matching lines @@
   return host == render_frame_host_;
 }
 
 void RenderFrameDevToolsAgentHost::OnDispatchOnInspectorFrontend(
     const DevToolsMessageChunk& message) {
   if (!IsAttached() || !render_frame_host_)
     return;
   ProcessChunkedMessageFromAgent(message);
 }
 
-void RenderFrameDevToolsAgentHost::DispatchOnInspectorFrontend(
-    const std::string& message) {
-  if (!IsAttached() || !render_frame_host_)
-    return;
-  SendMessageToClient(message);
-}
-
 bool RenderFrameDevToolsAgentHost::IsChildFrame() {
   return render_frame_host_ && render_frame_host_->GetParent();
 }
 
 }  // namespace content