DevTools: pass agent host id to the renderer (Blink).

Source/core/inspector/InspectorController.cpp

Index: Source/core/inspector/InspectorController.cpp
diff --git a/Source/core/inspector/InspectorController.cpp b/Source/core/inspector/InspectorController.cpp
index 0d868c44dc3e537f9646ddbb5433e13ac381f2de..3da18d975b1a6fb0bf05cbb80fb913122f09e5ed 100644
--- a/Source/core/inspector/InspectorController.cpp
+++ b/Source/core/inspector/InspectorController.cpp
@@ -150,10 +150,10 @@ void InspectorController::initializeDeferredAgents()
     InspectorOverlay* overlay = m_overlay.get();
 
     OwnPtr<InspectorResourceAgent> resourceAgentPtr(InspectorResourceAgent::create(m_pageAgent));
-    InspectorResourceAgent* resourceAgent = resourceAgentPtr.get();
+    m_resourceAgent = resourceAgentPtr.get();
     m_agents.append(resourceAgentPtr.release());
 
-    m_agents.append(InspectorCSSAgent::create(m_domAgent, m_pageAgent, resourceAgent));
+    m_agents.append(InspectorCSSAgent::create(m_domAgent, m_pageAgent, m_resourceAgent));
 
     m_agents.append(InspectorDOMStorageAgent::create(m_pageAgent));
 
@@ -207,11 +207,13 @@ void InspectorController::didClearDocumentOfWindowObject(LocalFrame* frame)
         m_inspectorFrontendClient->windowObjectCleared();
 }
 
-void InspectorController::connectFrontend(InspectorFrontendChannel* frontendChannel)
+void InspectorController::connectFrontend(const String& hostId, InspectorFrontendChannel* frontendChannel)
 {
     ASSERT(frontendChannel);
+    m_hostId = hostId;
 
     initializeDeferredAgents();
+    m_resourceAgent->setHostId(hostId);
 
     m_inspectorFrontend = adoptPtr(new InspectorFrontend(frontendChannel));
     // We can reconnect to existing front-end -> unmute state.
@@ -247,6 +249,7 @@ void InspectorController::disconnectFrontend()
     m_overlay->freePage();
     InspectorInstrumentation::frontendDeleted();
     InspectorInstrumentation::unregisterInstrumentingAgents(m_instrumentingAgents.get());
+    m_hostId = "";
 }
 
 void InspectorController::reconnectFrontend()
@@ -254,14 +257,15 @@ void InspectorController::reconnectFrontend()
     if (!m_inspectorFrontend)
         return;
     InspectorFrontendChannel* frontendChannel = m_inspectorFrontend->channel();
+    String hostId = m_hostId;
     disconnectFrontend();
-    connectFrontend(frontendChannel);
+    connectFrontend(hostId, frontendChannel);
 }
 
-void InspectorController::reuseFrontend(InspectorFrontendChannel* frontendChannel, const String& inspectorStateCookie)
+void InspectorController::reuseFrontend(const String& hostId, InspectorFrontendChannel* frontendChannel, const String& inspectorStateCookie)
 {
     ASSERT(!m_inspectorFrontend);
-    connectFrontend(frontendChannel);
+    connectFrontend(hostId, frontendChannel);
     m_state->loadFromCookie(inspectorStateCookie);
     m_agents.restore();
 }
@@ -390,8 +394,8 @@ void InspectorController::resume()
 
 void InspectorController::setResourcesDataSizeLimitsFromInternals(int maximumResourcesContentSize, int maximumSingleResourceContentSize)
 {
-    if (InspectorResourceAgent* resourceAgent = m_instrumentingAgents->inspectorResourceAgent())
-        resourceAgent->setResourcesDataSizeLimitsFromInternals(maximumResourcesContentSize, maximumSingleResourceContentSize);
+    if (m_resourceAgent)
+        m_resourceAgent->setResourcesDataSizeLimitsFromInternals(maximumResourcesContentSize, maximumSingleResourceContentSize);
 }
 
 void InspectorController::willProcessTask()