LoadTiming in net part 7: Hooking it all up

webkit/glue/resource_loader_bridge.h

 // Copyright (c) 2012 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.
 //
 // The intent of this file is to provide a type-neutral abstraction between
 // Chrome and WebKit for resource loading. This pure-virtual interface is
 // implemented by the embedder.
 //
 // One of these objects will be created by WebKit for each request. WebKit
 // will own the pointer to the bridge, and will delete it when the request is
@@ skipping 12 matching lines @@
 #if defined(OS_POSIX)
 #include "base/file_descriptor_posix.h"
 #endif
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/platform_file.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/host_port_pair.h"
+#include "net/base/load_timing_info.h"
 #include "net/base/request_priority.h"
 #include "net/url_request/url_request_status.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h"
 #include "webkit/glue/resource_type.h"
 #include "webkit/glue/webkit_glue_export.h"
 
 namespace net {
 class HttpResponseHeaders;
 }
 
 namespace webkit_glue {
 class ResourceRequestBody;
 
-// Structure containing timing information for the request. It addresses
-// http://groups.google.com/group/http-archive-specification/web/har-1-1-spec
-// and http://dev.w3.org/2006/webapi/WebTiming/ needs.
-//
-// All the values for starts and ends are given in milliseconds and are
-// offsets with respect to the given base time.
-struct ResourceLoadTimingInfo {
-  WEBKIT_GLUE_EXPORT ResourceLoadTimingInfo();
-  WEBKIT_GLUE_EXPORT ~ResourceLoadTimingInfo();
-
-  // All the values in this struct are given as offsets in ticks wrt
-  // this base tick count.
-  base::TimeTicks base_ticks;
-
-  // The value of Time::Now() when base_ticks was set.
-  base::Time base_time;
-
-  // The time that proxy processing started. For requests with no proxy phase,
-  // this time is -1.
-  int32 proxy_start;
-
-  // The time that proxy processing ended. For reused sockets this time
-  // is -1.
-  int32 proxy_end;
-
-  // The time that DNS lookup started. For reused sockets this time is -1.
-  int32 dns_start;
-
-  // The time that DNS lookup ended. For reused sockets this time is -1.
-  int32 dns_end;
-
-  // The time that establishing connection started. Connect time includes
-  // DNS, blocking, TCP, TCP retries and SSL time.
-  int32 connect_start;
-
-  // The time that establishing connection ended. Connect time includes
-  // DNS, blocking, TCP, TCP retries and SSL time.
-  int32 connect_end;
-
-  // The time at which SSL handshake started. For non-HTTPS requests this
-  // is 0.
-  int32 ssl_start;
-
-  // The time at which SSL handshake ended. For non-HTTPS requests this is 0.
-  int32 ssl_end;
-
-  // The time that HTTP request started. For non-HTTP requests this is 0.
-  int32 send_start;
-
-  // The time that HTTP request ended. For non-HTTP requests this is 0.
-  int32 send_end;
-
-  // The time at which receiving HTTP headers started. For non-HTTP requests
-  // this is 0.
-  int32 receive_headers_start;
-
-  // The time at which receiving HTTP headers ended. For non-HTTP requests
-  // this is 0.
-  int32 receive_headers_end;
-};
-
 struct ResourceDevToolsInfo : base::RefCounted<ResourceDevToolsInfo> {
   typedef std::vector<std::pair<std::string, std::string> >
       HeadersVector;
 
   WEBKIT_GLUE_EXPORT ResourceDevToolsInfo();
 
   int32 http_status_code;
   std::string http_status_text;
   HeadersVector request_headers;
   HeadersVector response_headers;
@@ skipping 38 matching lines @@
   // no data, contains -1.
   int64 encoded_data_length;
 
   // The appcache this response was loaded from, or kNoCacheId.
   int64 appcache_id;
 
   // The manifest url of the appcache this response was loaded from.
   // Note: this value is only populated for main resource requests.
   GURL appcache_manifest_url;
 
-  // Connection identifier from the underlying network stack. In case there
-  // is no associated connection, contains 0.
-  uint32 connection_id;
-
-  // Determines whether physical connection reused.
-  bool connection_reused;
-
   // Detailed timing information used by the WebTiming, HAR and Developer
-  // Tools.
-  ResourceLoadTimingInfo load_timing;
+  // Tools.  Includes socket ID and socket reuse information.
+  net::LoadTimingInfo load_timing;
 
   // Actual request and response headers, as obtained from the network stack.
   // Only present if request had LOAD_REPORT_RAW_HEADERS in load_flags, and
   // requesting renderer had CanReadRowCookies permission.
   scoped_refptr<ResourceDevToolsInfo> devtools_info;
 
   // The path to a file that will contain the response body.  It may only
   // contain a portion of the response body at the time that the ResponseInfo
   // becomes available.
   base::FilePath download_file_path;
@@ skipping 207 matching lines @@
   // methods may be called to construct the body of the request.
   WEBKIT_GLUE_EXPORT ResourceLoaderBridge();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ResourceLoaderBridge);
 };
 
 }  // namespace webkit_glue
 
 #endif  // WEBKIT_GLUE_RESOURCE_LOADER_BRIDGE_H_