Add histograms for network activity, and total/cumulative

net/url_request/url_request_http_job.cc

Index: net/url_request/url_request_http_job.cc
===================================================================
--- net/url_request/url_request_http_job.cc	(revision 150909)
+++ net/url_request/url_request_http_job.cc	(working copy)
@@ -88,25 +88,39 @@
   void OnDetachRequest() {
     if (request_ == NULL || network_delegate_ == NULL)
       return;
-    network_delegate_->NotifyCacheWaitStateChange(
+    network_delegate_->NotifyRequestWaitStateChange(
         *request_,
-        NetworkDelegate::CACHE_WAIT_STATE_RESET);
+        NetworkDelegate::REQUEST_WAIT_STATE_RESET);
     request_ = NULL;
   }
   virtual void OnCacheActionStart() OVERRIDE {
     if (request_ == NULL || network_delegate_ == NULL)
       return;
-    network_delegate_->NotifyCacheWaitStateChange(
+    network_delegate_->NotifyRequestWaitStateChange(
         *request_,
-        NetworkDelegate::CACHE_WAIT_STATE_START);
+        NetworkDelegate::REQUEST_WAIT_STATE_CACHE_START);
   }
   virtual void OnCacheActionFinish() OVERRIDE {
     if (request_ == NULL || network_delegate_ == NULL)
       return;
-    network_delegate_->NotifyCacheWaitStateChange(
+    network_delegate_->NotifyRequestWaitStateChange(
         *request_,
-        NetworkDelegate::CACHE_WAIT_STATE_FINISH);
+        NetworkDelegate::REQUEST_WAIT_STATE_CACHE_FINISH);
   }
+  virtual void OnNetworkActionStart() OVERRIDE {
+    if (request_ == NULL || network_delegate_ == NULL)
+      return;
+    network_delegate_->NotifyRequestWaitStateChange(
+        *request_,
+        NetworkDelegate::REQUEST_WAIT_STATE_NETWORK_START);
+  }
+  virtual void OnNetworkActionFinish() OVERRIDE {
+    if (request_ == NULL || network_delegate_ == NULL)
+      return;
+    network_delegate_->NotifyRequestWaitStateChange(
+        *request_,
+        NetworkDelegate::REQUEST_WAIT_STATE_NETWORK_FINISH);
+  }
  private:
   URLRequest* request_;
   NetworkDelegate* network_delegate_;
@@ -887,6 +901,8 @@
 }
 
 void URLRequestHttpJob::Kill() {
+  http_transaction_delegate_->OnDetachRequest();
+
   if (!transaction_.get())
     return;