net: Return LoadTiming information in the case of a cache hit

net/http/http_cache_transaction.h

Index: net/http/http_cache_transaction.h
===================================================================
--- net/http/http_cache_transaction.h	(revision 199488)
+++ net/http/http_cache_transaction.h	(working copy)
@@ -24,6 +24,7 @@
 class PartialData;
 struct HttpRequestInfo;
 class HttpTransactionDelegate;
+struct LoadTimingInfo;
 
 // This is the transaction that is returned by the HttpCache transaction
 // factory.
@@ -385,6 +386,10 @@
   void RunDelayedLoop(base::TimeTicks delay_start_time,
                       base::TimeDelta intended_delay, int result);
 
+  // Resets |network_trans_|, which must be non-NULL.  Also updates
+  // |old_network_trans_load_timing_|, which must be NULL when this is called.
+  void ResetNetworkTransaction();
+
   State next_state_;
   const HttpRequestInfo* request_;
   RequestPriority priority_;
@@ -447,6 +452,11 @@
   int sensitivity_analysis_percent_increase_;
 
   HttpTransactionDelegate* transaction_delegate_;
+
+  // Load timing information for the last network request, if any.  Set in the
+  // 304 and 206 response cases, as the network transaction may be destroyed
+  // before the caller requests load timing information.
+  scoped_ptr<LoadTimingInfo> old_network_trans_load_timing_;
 };
 
 }  // namespace net