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

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

Index: third_party/WebKit/Source/core/workers/WorkerInspectorProxy.cpp
diff --git a/third_party/WebKit/Source/core/workers/WorkerInspectorProxy.cpp b/third_party/WebKit/Source/core/workers/WorkerInspectorProxy.cpp
index ca5e69ecd9f038500ea04d69a2f0c552d917595c..6abe3aef9ad5b9371dbbf28d0712ae34da21a907 100644
--- a/third_party/WebKit/Source/core/workers/WorkerInspectorProxy.cpp
+++ b/third_party/WebKit/Source/core/workers/WorkerInspectorProxy.cpp
@@ -20,6 +20,7 @@
     : m_workerThread(nullptr)
     , m_executionContext(nullptr)
     , m_pageInspector(nullptr)
+    , m_workerGlobalScopeProxy(nullptr)
 {
 }
 
@@ -43,10 +44,9 @@
 {
     m_workerThread = workerThread;
     m_executionContext = context;
-    m_url = url.getString();
     // We expect everyone starting worker thread to synchronously ask for workerStartMode right before.
     bool waitingForDebugger = InspectorInstrumentation::shouldWaitForDebuggerOnWorkerStart(context);
-    InspectorInstrumentation::didStartWorker(context, this, waitingForDebugger);
+    InspectorInstrumentation::didStartWorker(context, this, url, waitingForDebugger);
 }
 
 void WorkerInspectorProxy::workerThreadTerminated()
@@ -55,18 +55,6 @@
         InspectorInstrumentation::workerTerminated(m_executionContext, this);
     m_workerThread = nullptr;
     m_pageInspector = nullptr;
-}
-
-void WorkerInspectorProxy::dispatchMessageFromWorker(const String& message)
-{
-    if (m_pageInspector)
-        m_pageInspector->dispatchMessageFromWorker(this, message);
-}
-
-void WorkerInspectorProxy::workerConsoleAgentEnabled()
-{
-    if (m_pageInspector)
-        m_pageInspector->workerConsoleAgentEnabled(this);
 }
 
 static void connectToWorkerGlobalScopeInspectorTask(WorkerThread* workerThread)
@@ -88,9 +76,8 @@
     workerThread->workerGlobalScope()->workerInspectorController()->disconnectFrontend();
 }
 
-void WorkerInspectorProxy::disconnectFromInspector(WorkerInspectorProxy::PageInspector* pageInspector)
+void WorkerInspectorProxy::disconnectFromInspector()
 {
-    ASSERT(m_pageInspector == pageInspector);
     m_pageInspector = nullptr;
     if (m_workerThread)
         m_workerThread->appendDebuggerTask(threadSafeBind(disconnectFromWorkerGlobalScopeInspectorTask, AllowCrossThreadAccess(m_workerThread)));
@@ -117,6 +104,7 @@
 DEFINE_TRACE(WorkerInspectorProxy)
 {
     visitor->trace(m_executionContext);
+    visitor->trace(m_pageInspector);
 }
 
 } // namespace blink