Add histograms for network activity, and total/cumulative

net/base/network_delegate.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.
 
 #ifndef NET_BASE_NETWORK_DELEGATE_H_
 #define NET_BASE_NETWORK_DELEGATE_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 30 matching lines @@
   // OnAuthRequired call. It's placed in this file to prevent url_request.h
   // from having to include network_delegate.h.
   enum AuthRequiredResponse {
     AUTH_REQUIRED_RESPONSE_NO_ACTION,
     AUTH_REQUIRED_RESPONSE_SET_AUTH,
     AUTH_REQUIRED_RESPONSE_CANCEL_AUTH,
     AUTH_REQUIRED_RESPONSE_IO_PENDING,
   };
   typedef base::Callback<void(AuthRequiredResponse)> AuthCallback;
 
-  enum CacheWaitState {
-    CACHE_WAIT_STATE_START,
-    CACHE_WAIT_STATE_FINISH,
-    CACHE_WAIT_STATE_RESET
+  enum RequestWaitState {
+    REQUEST_WAIT_STATE_CACHE_START,
+    REQUEST_WAIT_STATE_CACHE_FINISH,
+    REQUEST_WAIT_STATE_NETWORK_START,
+    REQUEST_WAIT_STATE_NETWORK_FINISH,
+    REQUEST_WAIT_STATE_RESET
   };
 
   virtual ~NetworkDelegate() {}
 
   // Notification interface called by the network stack. Note that these
   // functions mostly forward to the private virtuals. They also add some sanity
   // checking on parameters. See the corresponding virtuals for explanations of
   // the methods and their arguments.
   int NotifyBeforeURLRequest(URLRequest* request,
                              const CompletionCallback& callback,
@@ skipping 24 matching lines @@
   bool CanSetCookie(const URLRequest& request,
                     const std::string& cookie_line,
                     CookieOptions* options);
   bool CanAccessFile(const URLRequest& request,
                      const FilePath& path) const;
   bool CanThrottleRequest(const URLRequest& request) const;
 
   int NotifyBeforeSocketStreamConnect(SocketStream* socket,
                                       const CompletionCallback& callback);
 
-  void NotifyCacheWaitStateChange(const URLRequest& request,
-                                  CacheWaitState state);
+  void NotifyRequestWaitStateChange(const URLRequest& request,
+                                    RequestWaitState state);
 
  private:
   // This is the interface for subclasses of NetworkDelegate to implement. These
   // member functions will be called by the respective public notification
   // member function, which will perform basic sanity checking.
 
   // Called before a request is sent. Allows the delegate to rewrite the URL
   // being fetched by modifying |new_url|. |callback| and |new_url| are valid
   // only until OnURLRequestDestroyed is called for this request. Returns a net
   // status code, generally either OK to continue with the request or
@@ skipping 107 matching lines @@
   // Returns true if the given request may be rejected when the
   // URLRequestThrottlerManager believes the server servicing the
   // request is overloaded or down.
   virtual bool OnCanThrottleRequest(const URLRequest& request) const = 0;
 
   // Called before a SocketStream tries to connect.
   virtual int OnBeforeSocketStreamConnect(
       SocketStream* socket, const CompletionCallback& callback) = 0;
 
   // Called when the completion of a URLRequest is blocking on a cache
-  // transaction (CACHE_WAIT_STATE_START), or when a URLRequest is no longer
-  // blocked on a cache transaction (CACHE_WAIT_STATE_FINISH), or when a
-  // URLRequest is reset (CACHE_WAIT_STATE_RESET), indicating
-  // cancellation of any pending cache waits for this request.  Notice that
-  // START can be called several times for the same request.  It is the
-  // responsibility of the delegate to keep track of the number of outstanding
-  // cache transactions.
-  virtual void OnCacheWaitStateChange(const URLRequest& request,
-                                      CacheWaitState state) = 0;
+  // action or a network action, or when that is no longer the case.
+  // CACHE_WAIT_STATE_RESET indicates for a given URLRequest

[rvargas (doing something else), 2012/08/15 22:36:49]

stale

[tburkard, 2012/08/15 23:00:47]

Done.

+  // cancellation of any pending waits for this request.
+  virtual void OnRequestWaitStateChange(const URLRequest& request,
+                                        RequestWaitState state) = 0;
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_NETWORK_DELEGATE_H_