Revert r143458 (which re-applies r143341 and r142979).

content/browser/renderer_host/resource_request_info_impl.h

Index: content/browser/renderer_host/resource_request_info_impl.h
===================================================================
--- content/browser/renderer_host/resource_request_info_impl.h	(revision 143642)
+++ content/browser/renderer_host/resource_request_info_impl.h	(working copy)
@@ -25,6 +25,7 @@
 }
 
 namespace content {
+class AsyncResourceHandler;
 class CrossSiteResourceHandler;
 class ResourceContext;
 struct GlobalRequestID;
@@ -83,9 +84,7 @@
 
   GlobalRequestID GetGlobalRequestID() const;
 
-  // CrossSiteResourceHandler for this request, if it is a cross-site request.
-  // (NULL otherwise.) This handler is part of the chain of ResourceHandlers
-  // pointed to by resource_handler, and is not owned by this class.
+  // CrossSiteResourceHandler for this request.  May be null.
   CrossSiteResourceHandler* cross_site_handler() {
     return cross_site_handler_;
   }
@@ -93,17 +92,19 @@
     cross_site_handler_ = h;
   }
 
+  // AsyncResourceHandler for this request.  May be null.
+  AsyncResourceHandler* async_handler() {
+    return async_handler_;
+  }
+  void set_async_handler(AsyncResourceHandler* h) {
+    async_handler_ = h;
+  }
+
   // Identifies the type of process (renderer, plugin, etc.) making the request.
   ProcessType process_type() const {
     return process_type_;
   }
 
-  // Number of messages we've sent to the renderer that we haven't gotten an
-  // ACK for. This allows us to avoid having too many messages in flight.
-  int pending_data_count() const { return pending_data_count_; }
-  void IncrementPendingDataCount() { pending_data_count_++; }
-  void DecrementPendingDataCount() { pending_data_count_--; }
-
   // Downloads are allowed only as a top level request.
   bool allow_download() const { return allow_download_; }
 
@@ -130,6 +131,7 @@
  private:
   // Non-owning, may be NULL.
   CrossSiteResourceHandler* cross_site_handler_;
+  AsyncResourceHandler* async_handler_;
 
   ProcessType process_type_;
   int child_id_;
@@ -140,7 +142,6 @@
   int64 frame_id_;
   bool parent_is_main_frame_;
   int64 parent_frame_id_;
-  int pending_data_count_;
   bool is_download_;
   bool allow_download_;
   bool has_user_gesture_;