DevTools: remove support for out-of-process dedicated workers

Now that Chromium uses in-process dedicated workers it makes
sense to drop support for out-of-process dedicated workers from
DevTools code .

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/8171010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104447 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 4 insertions, 155 deletions

diff --git a/content/renderer/websharedworker_proxy.cc b/content/renderer/websharedworker_proxy.cc
index 9bd48b4..203ec6b 100644
--- a/content/renderer/websharedworker_proxy.cc
+++ b/content/renderer/websharedworker_proxy.cc
@@ -18,8 +18,7 @@ WebSharedWorkerProxy::WebSharedWorkerProxy(ChildThread* child_thread,
                     document_id,
                     exists ? route_id : MSG_ROUTING_NONE,
                     render_view_route_id,
-                    0,
-                    NULL),
+                    0),
       pending_route_id_(route_id),
       connect_listener_(NULL) {
 }
diff --git a/content/renderer/webworker_base.cc b/content/renderer/webworker_base.cc
index c35ad64..c8e1304 100644
--- a/content/renderer/webworker_base.cc
+++ b/content/renderer/webworker_base.cc
@@ -8,7 +8,6 @@
 #include "content/common/view_messages.h"
 #include "content/common/webmessageportchannel_impl.h"
 #include "content/common/worker_messages.h"
-#include "content/renderer/worker_devtools_agent_proxy.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWorkerClient.h"
 
@@ -23,12 +22,10 @@ WebWorkerBase::WebWorkerBase(
     unsigned long long document_id,
     int route_id,
     int render_view_route_id,
-    int parent_appcache_host_id,
-    WorkerDevToolsAgentProxy* devtools_proxy)
+    int parent_appcache_host_id)
     : route_id_(route_id),
       render_view_route_id_(render_view_route_id),
       child_thread_(child_thread),
-      devtools_proxy_(devtools_proxy),
       document_id_(document_id),
       parent_appcache_host_id_(parent_appcache_host_id) {
   if (route_id_ != MSG_ROUTING_NONE)
@@ -53,9 +50,6 @@ void WebWorkerBase::Disconnect() {
   child_thread_->RemoveRoute(route_id_);
 
   route_id_ = MSG_ROUTING_NONE;
-
-  if (devtools_proxy_.get())
-    devtools_proxy_->SetRouteId(MSG_ROUTING_NONE);
 }
 
 void WebWorkerBase::CreateWorkerContext(const GURL& script_url,
@@ -83,9 +77,6 @@ void WebWorkerBase::CreateWorkerContext(const GURL& script_url,
 
   child_thread_->AddRoute(route_id_, this);
 
-  if (devtools_proxy_.get())
-    devtools_proxy_->SetRouteId(route_id_);
-
   // We make sure that the start message is the first, since postMessage or
   // connect might have already been called.
   queued_messages_.insert(queued_messages_.begin(),
diff --git a/content/renderer/webworker_base.h b/content/renderer/webworker_base.h
index 37193ae..afd962d 100644
--- a/content/renderer/webworker_base.h
+++ b/content/renderer/webworker_base.h
@@ -15,7 +15,6 @@
 
 class ChildThread;
 class GURL;
-class WorkerDevToolsAgentProxy;
 
 // WebWorkerBase is the common base class used by both WebWorkerProxy and
 // WebSharedWorker. It contains logic to support starting up both dedicated
@@ -66,8 +65,7 @@ class WebWorkerBase : public IPC::Channel::Listener {
                 unsigned long long document_id,
                 int route_id,
                 int render_view_route_id,
-                int parent_appcache_host_id,
-                WorkerDevToolsAgentProxy*);
+                int parent_appcache_host_id);
 
   // Routing id associated with this worker - used to receive messages from the
   // worker, and also to route messages to the worker (WorkerService contains
@@ -80,8 +78,6 @@ class WebWorkerBase : public IPC::Channel::Listener {
 
   ChildThread* child_thread_;
 
-  scoped_ptr<WorkerDevToolsAgentProxy> devtools_proxy_;
-
  private:
   void CreateWorkerContext(const GURL& script_url,
                            bool is_shared,
diff --git a/content/renderer/webworker_proxy.cc b/content/renderer/webworker_proxy.cc
index 1457be7..2b6ce73 100644
--- a/content/renderer/webworker_proxy.cc
+++ b/content/renderer/webworker_proxy.cc
@@ -9,7 +9,6 @@
 #include "content/common/view_messages.h"
 #include "content/common/webmessageportchannel_impl.h"
 #include "content/common/worker_messages.h"
-#include "content/renderer/worker_devtools_agent_proxy.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWorkerClient.h"
 
@@ -30,8 +29,7 @@ WebWorkerProxy::WebWorkerProxy(
           0,
           MSG_ROUTING_NONE,
           render_view_route_id,
-          parent_appcache_host_id,
-          new WorkerDevToolsAgentProxy(this, MSG_ROUTING_NONE, client)),
+          parent_appcache_host_id),
       client_(client) {
   // TODO(atwilson): Change to pass in a real document_id when we support nested
   // workers.
@@ -91,25 +89,10 @@ void WebWorkerProxy::workerObjectDestroyed() {
 void WebWorkerProxy::clientDestroyed() {
 }
 
-void WebWorkerProxy::attachDevTools() {
-  devtools_proxy_->AttachDevTools();
-}
-
-void WebWorkerProxy::detachDevTools() {
-  devtools_proxy_->DetachDevTools();
-}
-
-void WebWorkerProxy::dispatchDevToolsMessage(const WebString& message) {
-  devtools_proxy_->SendDevToolsMessage(message.utf8());
-}
-
 bool WebWorkerProxy::OnMessageReceived(const IPC::Message& message) {
   if (!client_)
     return false;
 
-  if (devtools_proxy_->OnMessageReceived(message))
-    return true;
-
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(WebWorkerProxy, message)
     IPC_MESSAGE_HANDLER(ViewMsg_WorkerCreated, OnWorkerCreated)
diff --git a/content/renderer/webworker_proxy.h b/content/renderer/webworker_proxy.h
index fea3811..80014ac 100644
--- a/content/renderer/webworker_proxy.h
+++ b/content/renderer/webworker_proxy.h
@@ -42,10 +42,6 @@ class WebWorkerProxy : public WebKit::WebWorker, private WebWorkerBase {
   virtual void workerObjectDestroyed();
   virtual void clientDestroyed();
 
-  virtual void attachDevTools();
-  virtual void detachDevTools();
-  virtual void dispatchDevToolsMessage(const WebKit::WebString&);
-
   // IPC::Channel::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& message);
 
diff --git a/content/renderer/worker_devtools_agent_proxy.cc b/content/renderer/worker_devtools_agent_proxy.cc
deleted file mode 100644
index 7f898ad..0000000
--- a/content/renderer/worker_devtools_agent_proxy.cc
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) 2011 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/renderer/worker_devtools_agent_proxy.h"
-
-#include "content/common/devtools_messages.h"
-#include "content/renderer/webworker_base.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebCString.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebWorkerClient.h"
-
-using WebKit::WebString;
-using WebKit::WebWorkerClient;
-
-WorkerDevToolsAgentProxy::WorkerDevToolsAgentProxy(WebWorkerBase* webworker,
-                                                   int route_id,
-                                                   WebWorkerClient* client)
-    : route_id_(route_id),
-      webworker_(webworker),
-      webworker_client_(client) {
-}
-
-WorkerDevToolsAgentProxy::~WorkerDevToolsAgentProxy() {
-}
-
-void WorkerDevToolsAgentProxy::WorkerProxyDestroyed() {
-  delete this;
-}
-
-void WorkerDevToolsAgentProxy::SetRouteId(int route_id) {
-  route_id_ = route_id;
-}
-
-// Called on the Renderer thread.
-bool WorkerDevToolsAgentProxy::OnMessageReceived(const IPC::Message& message) {
-  bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(WorkerDevToolsAgentProxy, message)
-    IPC_MESSAGE_HANDLER(DevToolsAgentMsg_DispatchMessageFromWorker,
-                        OnDispatchMessageFromWorker)
-    IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP()
-  return handled;
-}
-
-void WorkerDevToolsAgentProxy::AttachDevTools() {
-  Send(new DevToolsAgentMsg_Attach(route_id_));
-}
-
-void WorkerDevToolsAgentProxy::DetachDevTools() {
-  Send(new DevToolsAgentMsg_Detach(route_id_));
-}
-
-void WorkerDevToolsAgentProxy::SendDevToolsMessage(
-    const std::string& message) {
-  Send(new DevToolsAgentMsg_DispatchOnInspectorBackend(route_id_, message));
-}
-
-void WorkerDevToolsAgentProxy::OnDispatchMessageFromWorker(
-    const std::string& message) {
-  webworker_client_->dispatchDevToolsMessage(WebString::fromUTF8(message));
-}
-
-void WorkerDevToolsAgentProxy::Send(IPC::Message* message) {
-  webworker_->Send(message);
-}
diff --git a/content/renderer/worker_devtools_agent_proxy.h b/content/renderer/worker_devtools_agent_proxy.h
deleted file mode 100644
index 99ae1f2b..0000000
--- a/content/renderer/worker_devtools_agent_proxy.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2011 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_RENDERER_WORKER_DEVTOOLS_AGENT_PROXY_H_
-#define CONTENT_RENDERER_WORKER_DEVTOOLS_AGENT_PROXY_H_
-#pragma once
-
-#include <string>
-
-#include "base/basictypes.h"
-
-namespace IPC {
-class Message;
-}
-
-namespace WebKit {
-class WebWorkerClient;
-}
-
-class WebWorkerBase;
-
-class WorkerDevToolsAgentProxy {
- public:
-  WorkerDevToolsAgentProxy(WebWorkerBase*,
-                           int route_id,
-                           WebKit::WebWorkerClient*);
-  ~WorkerDevToolsAgentProxy();
-
-  void WorkerProxyDestroyed();
-  void SetRouteId(int route_id);
-  bool OnMessageReceived(const IPC::Message& message);
-
-  void AttachDevTools();
-  void DetachDevTools();
-  void SendDevToolsMessage(const std::string&);
-
- private:
-  void OnDispatchMessageFromWorker(const std::string& message);
-
-  void Send(IPC::Message* message);
-
-  int route_id_;
-  WebWorkerBase* webworker_;
-  WebKit::WebWorkerClient* webworker_client_;
-
-  DISALLOW_COPY_AND_ASSIGN(WorkerDevToolsAgentProxy);
-};
-
-#endif  // CONTENT_RENDERER_WORKER_DEVTOOLS_AGENT_PROXY_H_