Revert of [DevTools] Show sync XHR info during request loading.

Source/core/inspector/InspectorResourceAgent.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 351 matching lines @@
             initiatorObject = it->value;
     }
 
     RefPtr<TypeBuilder::Network::Request> requestInfo(buildObjectForResourceRequest(request));
 
     if (!m_hostId.isEmpty())
         request.addHTTPHeaderField(kDevToolsEmulateNetworkConditionsClientId, AtomicString(m_hostId));
 
     TypeBuilder::Page::ResourceType::Enum resourceType = InspectorPageAgent::resourceTypeJson(type);
     frontend()->requestWillBeSent(requestId, frameId, loaderId, urlWithoutFragment(loader->url()).string(), requestInfo.release(), monotonicallyIncreasingTime(), currentTime(), initiatorObject, buildObjectForResourceResponse(redirectResponse), &resourceType);
-    if (m_pendingXHRReplayData && !m_pendingXHRReplayData->async())
-        frontend()->flush();
 }
 
 void InspectorResourceAgent::markResourceAsCached(unsigned long identifier)
 {
     frontend()->requestServedFromCache(IdentifiersFactory::requestId(identifier));
 }
 
 bool isResponseEmpty(PassRefPtr<TypeBuilder::Network::Response> response)
 {
     if (!response)
@@ skipping 100 matching lines @@
 }
 
 void InspectorResourceAgent::documentThreadableLoaderStartedLoadingForClient(unsigned long identifier, ThreadableLoaderClient* client)
 {
     if (!client)
         return;
 
     if (client == m_pendingEventSource) {
         m_eventSourceRequestIdMap.set(client, identifier);
         m_pendingEventSource = nullptr;
+        return;
     }
 
-    if (client == m_pendingXHR) {
-        String requestId = IdentifiersFactory::requestId(identifier);
-        m_resourcesData->setResourceType(requestId, InspectorPageAgent::XHRResource);
-        m_resourcesData->setXHRReplayData(requestId, m_pendingXHRReplayData.get());
-        m_pendingXHR = nullptr;
-        m_pendingXHRReplayData.clear();
-    }
+    PendingXHRReplayDataMap::iterator it = m_pendingXHRReplayData.find(client);
+    if (it == m_pendingXHRReplayData.end())
+        return;
+
+    String requestId = IdentifiersFactory::requestId(identifier);
+    m_resourcesData->setResourceType(requestId, InspectorPageAgent::XHRResource);
+    m_resourcesData->setXHRReplayData(requestId, it->value.get());
 }
 
 void InspectorResourceAgent::willLoadXHR(XMLHttpRequest* xhr, ThreadableLoaderClient* client, const AtomicString& method, const KURL& url, bool async, PassRefPtr<FormData> formData, const HTTPHeaderMap& headers, bool includeCredentials)
 {
     ASSERT(xhr);
-    m_pendingXHR = client;
-    m_pendingXHRReplayData = XHRReplayData::create(xhr->executionContext(), method, urlWithoutFragment(url), async, formData.get(), includeCredentials);
+    RefPtrWillBeRawPtr<XHRReplayData> xhrReplayData = XHRReplayData::create(xhr->executionContext(), method, urlWithoutFragment(url), async, formData.get(), includeCredentials);
     for (const auto& header : headers)
-        m_pendingXHRReplayData->addHeader(header.key, header.value);
+        xhrReplayData->addHeader(header.key, header.value);
+    m_pendingXHRReplayData.set(client, xhrReplayData);
 }
 
 void InspectorResourceAgent::delayedRemoveReplayXHR(XMLHttpRequest* xhr)
 {
     if (!m_replayXHRs.contains(xhr))
         return;
 
     m_replayXHRsToBeDeleted.add(xhr);
     m_replayXHRs.remove(xhr);
     m_removeFinishedReplayXHRTimer.startOneShot(0, FROM_HERE);
 }
 
 void InspectorResourceAgent::didFailXHRLoading(XMLHttpRequest* xhr, ThreadableLoaderClient* client)
 {
-    m_pendingXHR = nullptr;
-    m_pendingXHRReplayData.clear();
+    m_pendingXHRReplayData.remove(client);
 
     // This method will be called from the XHR.
     // We delay deleting the replay XHR, as deleting here may delete the caller.
     delayedRemoveReplayXHR(xhr);
 }
 
 void InspectorResourceAgent::didFinishXHRLoading(ExecutionContext* context, XMLHttpRequest* xhr, ThreadableLoaderClient* client, unsigned long identifier, ScriptString sourceString, const AtomicString& method, const String& url)
 {
-    m_pendingXHR = nullptr;
-    m_pendingXHRReplayData.clear();
+    m_pendingXHRReplayData.remove(client);
 
     // See comments on |didFailXHRLoading| for why we are delaying delete.
     delayedRemoveReplayXHR(xhr);
 
     if (m_state->getBoolean(ResourceAgentState::monitoringXHR)) {
         String message = "XHR finished loading: " + method + " \"" + url + "\".";
         RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(NetworkMessageSource, DebugMessageLevel, message);
         consoleMessage->setRequestIdentifier(identifier);
         m_pageAgent->frameHost()->consoleMessageStorage().reportMessage(context, consoleMessage.release());
     }
@@ skipping 369 matching lines @@
     , m_removeFinishedReplayXHRTimer(this, &InspectorResourceAgent::removeFinishedReplayXHRFired)
 {
 }
 
 bool InspectorResourceAgent::shouldForceCORSPreflight()
 {
     return m_state->getBoolean(ResourceAgentState::cacheDisabled);
 }
 
 } // namespace blink