LoadTiming in net part 7: Hooking it all up

content/common/resource_dispatcher.cc

Index: content/common/resource_dispatcher.cc
===================================================================
--- content/common/resource_dispatcher.cc	(revision 184957)
+++ content/common/resource_dispatcher.cc	(working copy)
@@ -232,8 +232,6 @@
   response->request_time = result.request_time;
   response->response_time = result.response_time;
   response->encoded_data_length = result.encoded_data_length;
-  response->connection_id = result.connection_id;
-  response->connection_reused = result.connection_reused;
   response->load_timing = result.load_timing;
   response->devtools_info = result.devtools_info;
   response->data.swap(result.data);
@@ -647,7 +645,7 @@
       request_info.response_start.is_null() ||
       browser_info.request_start.is_null() ||
       browser_info.response_start.is_null() ||
-      browser_info.load_timing.base_ticks.is_null()) {
+      browser_info.load_timing.request_start.is_null()) {
     return;
   }
   InterProcessTimeTicksConverter converter(
@@ -656,25 +654,22 @@
       RemoteTimeTicks::FromTimeTicks(browser_info.request_start),
       RemoteTimeTicks::FromTimeTicks(browser_info.response_start));
 
-  LocalTimeTicks renderer_base_ticks = converter.ToLocalTimeTicks(
-      RemoteTimeTicks::FromTimeTicks(browser_info.load_timing.base_ticks));
-  renderer_info->load_timing.base_ticks = renderer_base_ticks.ToTimeTicks();
-
 #define CONVERT(field) \
-  LocalTimeDelta renderer_##field = converter.ToLocalTimeDelta( \
-      RemoteTimeDelta::FromRawDelta(browser_info.load_timing.field)); \
-  renderer_info->load_timing.field = renderer_##field.ToInt32()
+  renderer_info->load_timing.field = converter.ToLocalTimeTicks( \

[darin (slow to review), 2013/02/28 16:57:35]

nit: it seems like you could save some generated code if you had a subroutine
that encapsulated the
converter.ToLocalTimeTicks(FromTimeTicks(...)).ToTimeTicks() business.

[mmenke, 2013/02/28 17:36:55]

Done.  I assume this ugliness is deliberate, to emphasize the difference between
remote and local times, so I added a function to this file rather than to the
converter itself.

+      RemoteTimeTicks::FromTimeTicks( \
+          browser_info.load_timing.field)).ToTimeTicks()
 
-  CONVERT(proxy_start);
-  CONVERT(dns_start);
-  CONVERT(dns_end);
-  CONVERT(connect_start);
-  CONVERT(connect_end);
-  CONVERT(ssl_start);
-  CONVERT(ssl_end);
+  CONVERT(request_start);
+  CONVERT(proxy_resolve_start);
+  CONVERT(proxy_resolve_end);
+  CONVERT(connect_timing.dns_start);
+  CONVERT(connect_timing.dns_end);
+  CONVERT(connect_timing.connect_start);
+  CONVERT(connect_timing.connect_end);
+  CONVERT(connect_timing.ssl_start);
+  CONVERT(connect_timing.ssl_end);
   CONVERT(send_start);
   CONVERT(send_end);
-  CONVERT(receive_headers_start);
   CONVERT(receive_headers_end);
 
 #undef CONVERT