[DevTools] Remove extra plumbing from InspectorWorkerAgent, prepare to multi-client.

third_party/WebKit/Source/core/workers/WorkerMessagingProxy.cpp

Index: third_party/WebKit/Source/core/workers/WorkerMessagingProxy.cpp
diff --git a/third_party/WebKit/Source/core/workers/WorkerMessagingProxy.cpp b/third_party/WebKit/Source/core/workers/WorkerMessagingProxy.cpp
index a246e1b0d952cf4c6a40192597c7bf5f9e4d99df..5edfbeb65633ae2a1526d35c7b3f508ee54f9506 100644
--- a/third_party/WebKit/Source/core/workers/WorkerMessagingProxy.cpp
+++ b/third_party/WebKit/Source/core/workers/WorkerMessagingProxy.cpp
@@ -86,7 +86,6 @@ WorkerMessagingProxy::WorkerMessagingProxy(InProcessWorkerBase* workerObject, Pa
     ASSERT(m_workerObject);
     ASSERT((m_executionContext->isDocument() && isMainThread())
         || (m_executionContext->isWorkerGlobalScope() && toWorkerGlobalScope(m_executionContext.get())->thread()->isCurrentThread()));
-    m_workerInspectorProxy->setWorkerGlobalScopeProxy(this);
 }
 
 WorkerMessagingProxy::~WorkerMessagingProxy()
@@ -96,7 +95,6 @@ WorkerMessagingProxy::~WorkerMessagingProxy()
         || (m_executionContext->isWorkerGlobalScope() && toWorkerGlobalScope(m_executionContext.get())->thread()->isCurrentThread()));
     if (m_loaderProxy)
         m_loaderProxy->detachProvider(this);
-    m_workerInspectorProxy->setWorkerGlobalScopeProxy(nullptr);
 }
 
 void WorkerMessagingProxy::startWorkerGlobalScope(const KURL& scriptURL, const String& userAgent, const String& sourceCode)
@@ -189,7 +187,7 @@ void WorkerMessagingProxy::reportConsoleMessage(MessageSource source, MessageLev
         return;
 
     RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(source, level, message, sourceURL, lineNumber);
-    consoleMessage->setWorkerGlobalScopeProxy(this);
+    consoleMessage->setWorkerInspectorProxy(m_workerInspectorProxy.get());
     frame->console().addMessage(consoleMessage.release());
 }
 
@@ -251,25 +249,14 @@ void WorkerMessagingProxy::terminateWorkerGlobalScope()
 
 void WorkerMessagingProxy::postMessageToPageInspector(const String& message)
 {
-    if (!m_workerInspectorProxy)
-        return;
-    WorkerInspectorProxy::PageInspector* pageInspector = m_workerInspectorProxy->pageInspector();
-    if (pageInspector)
-        pageInspector->dispatchMessageFromWorker(message);
+    if (m_workerInspectorProxy)
+        m_workerInspectorProxy->dispatchMessageFromWorker(message);
 }
 
 void WorkerMessagingProxy::postWorkerConsoleAgentEnabled()
 {
-    if (!m_workerInspectorProxy)
-        return;
-    WorkerInspectorProxy::PageInspector* pageInspector = m_workerInspectorProxy->pageInspector();
-    if (pageInspector)
-        pageInspector->workerConsoleAgentEnabled(this);
-}
-
-WorkerInspectorProxy* WorkerMessagingProxy::workerInspectorProxy()
-{
-    return m_workerInspectorProxy.get();
+    if (m_workerInspectorProxy)
+        m_workerInspectorProxy->workerConsoleAgentEnabled();
 }
 
 void WorkerMessagingProxy::confirmMessageFromWorkerObject(bool hasPendingActivity)
@@ -300,7 +287,7 @@ void WorkerMessagingProxy::terminateInternally()
     Document* document = toDocument(m_executionContext.get());
     LocalFrame* frame = document->frame();
     if (frame)
-        frame->console().adoptWorkerMessagesAfterTermination(this);
+        frame->console().adoptWorkerMessagesAfterTermination(m_workerInspectorProxy.get());
 }
 
 } // namespace blink