Use a monotonic clock (TimeTicks) to report network times to WebCore.

chrome/renderer/security_filter_peer.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/renderer/security_filter_peer.h"
 
 #include "base/stringprintf.h"
 #include "grit/generated_resources.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
@@ skipping 52 matching lines @@
   return new ReplaceContentPeer(NULL, peer, "text/html", html);
 }
 
 void SecurityFilterPeer::OnUploadProgress(uint64 position, uint64 size) {
   original_peer_->OnUploadProgress(position, size);
 }
 
 bool SecurityFilterPeer::OnReceivedRedirect(
     const GURL& new_url,
     const webkit_glue::ResourceResponseInfo& info,
+    const base::TimeTicks& start_time,
+    const base::TimeTicks& end_time,
     bool* has_new_first_party_for_cookies,
     GURL* new_first_party_for_cookies) {
   NOTREACHED();
   return false;
 }
 
 void SecurityFilterPeer::OnReceivedResponse(
-    const webkit_glue::ResourceResponseInfo& info) {
+    const webkit_glue::ResourceResponseInfo& info,
+    const base::TimeTicks& start_time,
+    const base::TimeTicks& end_time) {
   NOTREACHED();
 }
 
 void SecurityFilterPeer::OnReceivedData(const char* data,
                                         int data_length,
                                         int encoded_data_length) {
   NOTREACHED();
 }
 
-void SecurityFilterPeer::OnCompletedRequest(const net::URLRequestStatus& status,
-                                            const std::string& security_info,
-                                            const base::Time& completion_time) {
+void SecurityFilterPeer::OnCompletedRequest(
+    const net::URLRequestStatus& status,
+    const std::string& security_info,
+    const base::TimeTicks& completion_time) {
   NOTREACHED();
 }
 
 // static
 void ProcessResponseInfo(
     const webkit_glue::ResourceResponseInfo& info_in,
     webkit_glue::ResourceResponseInfo* info_out,
     const std::string& mime_type) {
   DCHECK(info_out);
   *info_out = info_in;
@@ skipping 27 matching lines @@
     webkit_glue::ResourceLoaderBridge::Peer* peer,
     const std::string& mime_type)
     : SecurityFilterPeer(resource_loader_bridge, peer),
       mime_type_(mime_type) {
 }
 
 BufferedPeer::~BufferedPeer() {
 }
 
 void BufferedPeer::OnReceivedResponse(
-    const webkit_glue::ResourceResponseInfo& info) {
+    const webkit_glue::ResourceResponseInfo& info,
+    const base::TimeTicks& start_time,
+    const base::TimeTicks& end_time) {
   ProcessResponseInfo(info, &response_info_, mime_type_);
+  start_time_ = start_time;
+  end_time_ = end_time;
 }
 
 void BufferedPeer::OnReceivedData(const char* data,
                                   int data_length,
                                   int encoded_data_length) {
   data_.append(data, data_length);
 }
 
-void BufferedPeer::OnCompletedRequest(const net::URLRequestStatus& status,
-                                      const std::string& security_info,
-                                      const base::Time& completion_time) {
+void BufferedPeer::OnCompletedRequest(
+    const net::URLRequestStatus& status,
+    const std::string& security_info,
+    const base::TimeTicks& completion_time) {
   // Make sure we delete ourselves at the end of this call.
   scoped_ptr<BufferedPeer> this_deleter(this);
 
   // Give sub-classes a chance at altering the data.
   if (status.status() != net::URLRequestStatus::SUCCESS || !DataReady()) {
     // Pretend we failed to load the resource.
-    original_peer_->OnReceivedResponse(response_info_);
+    original_peer_->OnReceivedResponse(response_info_, start_time_, end_time_);
     net::URLRequestStatus status(net::URLRequestStatus::CANCELED,
                                  net::ERR_ABORTED);
     original_peer_->OnCompletedRequest(status, security_info, completion_time);
     return;
   }
 
-  original_peer_->OnReceivedResponse(response_info_);
+  original_peer_->OnReceivedResponse(response_info_, start_time_, end_time_);
   if (!data_.empty())
     original_peer_->OnReceivedData(data_.data(),
                                    static_cast<int>(data_.size()),
                                    -1);
   original_peer_->OnCompletedRequest(status, security_info, completion_time);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ReplaceContentPeer
 
 ReplaceContentPeer::ReplaceContentPeer(
     webkit_glue::ResourceLoaderBridge* resource_loader_bridge,
     webkit_glue::ResourceLoaderBridge::Peer* peer,
     const std::string& mime_type,
     const std::string& data)
     : SecurityFilterPeer(resource_loader_bridge, peer),
       mime_type_(mime_type),
       data_(data) {
 }
 
 ReplaceContentPeer::~ReplaceContentPeer() {
 }
 
 void ReplaceContentPeer::OnReceivedResponse(
-    const webkit_glue::ResourceResponseInfo& info) {
+    const webkit_glue::ResourceResponseInfo& info,
+    const base::TimeTicks& start_time,
+    const base::TimeTicks& end_time) {
+  start_time_ = start_time;
+  end_time_ = end_time;
   // Ignore this, we'll serve some alternate content in OnCompletedRequest.
 }
 
 void ReplaceContentPeer::OnReceivedData(const char* data,
                                         int data_length,
                                         int encoded_data_length) {
   // Ignore this, we'll serve some alternate content in OnCompletedRequest.
 }
 
 void ReplaceContentPeer::OnCompletedRequest(
     const net::URLRequestStatus& status,
     const std::string& security_info,
-    const base::Time& completion_time) {
+    const base::TimeTicks& completion_time) {
   webkit_glue::ResourceResponseInfo info;
   ProcessResponseInfo(info, &info, mime_type_);
   info.security_info = security_info;
   info.content_length = static_cast<int>(data_.size());
-  original_peer_->OnReceivedResponse(info);
+  original_peer_->OnReceivedResponse(info, start_time_, end_time_);
   if (!data_.empty())
     original_peer_->OnReceivedData(data_.data(),
                                    static_cast<int>(data_.size()),
                                    -1);
   original_peer_->OnCompletedRequest(net::URLRequestStatus(),
                                      security_info,
                                      completion_time);
 
   // The request processing is complete, we must delete ourselves.
   delete this;
 }