Adding histograms showing fraction of page load times

chrome/browser/net/chrome_network_delegate.cc

 // 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.
 
 #include "chrome/browser/net/chrome_network_delegate.h"
 
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/extensions/api/proxy/proxy_api.h"
 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
 #include "chrome/browser/extensions/extension_event_router_forwarder.h"
 #include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
+#include "chrome/browser/net/cache_stats.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_request_info.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/net_errors.h"
@@ skipping 99 matching lines @@
     const policy::URLBlacklistManager* url_blacklist_manager,
     void* profile,
     CookieSettings* cookie_settings,
     BooleanPrefMember* enable_referrers)
     : event_router_(event_router),
       profile_(profile),
       cookie_settings_(cookie_settings),
       extension_info_map_(extension_info_map),
       enable_referrers_(enable_referrers),
       never_throttle_requests_(false),
-      url_blacklist_manager_(url_blacklist_manager) {
+      url_blacklist_manager_(url_blacklist_manager),
+      cache_stats_(chrome_browser_net::CacheStats::GetInstance()) {

[willchan no longer on Chromium, 2012/07/24 23:17:13]

https://groups.google.com/a/chromium.org/forum/#!msg/chromium-dev/P9tWR4mlUpE...
TL;DR: DestructionObserver results in problems due to shutdown ordering. We
generally try to avoid it. What's better is for you to provide defined
ownership. Put it in IOThread::Globals since it is a global that lives on the IO
thread. That way, it will be destroyed properly on shutdown when the IO thread
goes away. ProfileIOData has a pointer to IOThread::Globals on the IO thread, so
you can pass in the CacheStats object to ChromeNetworkDelegate via the
constructor.

It's possible that you could be cleaner and avoid having to check OTR in
CacheStats by simply having the ChromeNetworkDelegate for
OffTheRecordProfileIOData constructed with a NULL CacheStats so it doesn't try
to update it. Doesn't matter too much.

[tburkard, 2012/07/25 20:06:52]

Done.

   DCHECK(event_router);
   DCHECK(enable_referrers);
   DCHECK(!profile || cookie_settings);
 }
 
 ChromeNetworkDelegate::~ChromeNetworkDelegate() {}
 
 void ChromeNetworkDelegate::NeverThrottleRequests() {
   never_throttle_requests_ = true;
 }
@@ skipping 235 matching lines @@
     // URL access blocked by policy.
     socket->net_log()->AddEvent(
         net::NetLog::TYPE_CHROME_POLICY_ABORTED_REQUEST,
         net::NetLog::StringCallback("url",
                                     &socket->url().possibly_invalid_spec()));
     return net::ERR_NETWORK_ACCESS_DENIED;
   }
 #endif
   return net::OK;
 }
+
+void ChromeNetworkDelegate::OnCacheWaitStateChange(
+    const net::URLRequest& request,
+    CacheWaitState state) {
+  cache_stats_->OnCacheWaitStateChange(request, state);
+}