DevTools & WebTiming : Migrate from PassiveLogCollector to dedicated LoadTimingObserver.

webkit/glue/weburlloader_impl.cc

 // Copyright (c) 2006-2009 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.
 
 // An implementation of WebURLLoader in terms of ResourceLoaderBridge.
 
 #include "webkit/glue/weburlloader_impl.h"
 
 #include "base/file_path.h"
 #include "base/message_loop.h"
@@ skipping 154 matching lines @@
     const ResourceLoaderBridge::ResponseInfo& info,
     WebURLResponse* response) {
   response->setURL(url);
   response->setResponseTime(info.response_time.ToDoubleT());
   response->setMIMEType(WebString::fromUTF8(info.mime_type));
   response->setTextEncodingName(WebString::fromUTF8(info.charset));
   response->setExpectedContentLength(info.content_length);
   response->setSecurityInfo(info.security_info);
   response->setAppCacheID(info.appcache_id);
   response->setAppCacheManifestURL(info.appcache_manifest_url);
-  response->setWasCached(info.request_time > info.response_time);
+  response->setWasCached(!info.load_timing.base_time.is_null() &&
+      info.response_time < info.load_timing.base_time);
   response->setWasFetchedViaSPDY(info.was_fetched_via_spdy);
   response->setWasNpnNegotiated(info.was_npn_negotiated);
   response->setWasAlternateProtocolAvailable(
       info.was_alternate_protocol_available);
   response->setWasFetchedViaProxy(info.was_fetched_via_proxy);
   response->setConnectionID(info.connection_id);
+  response->setConnectionReused(info.connection_reused);
 
   WebURLLoadTiming timing;
   timing.initialize();
   const ResourceLoaderBridge::LoadTimingInfo& timing_info = info.load_timing;
   timing.setRequestTime(timing_info.base_time.ToDoubleT());
   timing.setProxyStart(timing_info.proxy_start);
   timing.setProxyEnd(timing_info.proxy_end);
   timing.setDNSStart(timing_info.dns_start);
   timing.setDNSEnd(timing_info.dns_end);
   timing.setConnectStart(timing_info.connect_start);
@@ skipping 484 matching lines @@
 
 void WebURLLoaderImpl::cancel() {
   context_->Cancel();
 }
 
 void WebURLLoaderImpl::setDefersLoading(bool value) {
   context_->SetDefersLoading(value);
 }
 
 }  // namespace webkit_glue