Refactor ResourceHandler API.

content/browser/loader/async_resource_handler.h

Index: content/browser/loader/async_resource_handler.h
diff --git a/content/browser/loader/async_resource_handler.h b/content/browser/loader/async_resource_handler.h
index a664c3e9927e6b972f639d399c1a076b8ee72828..f498d4c909814d4ce6f3b9e9b8aa35b8004a756e 100644
--- a/content/browser/loader/async_resource_handler.h
+++ b/content/browser/loader/async_resource_handler.h
@@ -25,6 +25,7 @@ class UploadProgress;
 
 namespace content {
 class ResourceBuffer;
+class ResourceController;
 class ResourceDispatcherHostImpl;
 class UploadProgressTracker;
 
@@ -40,17 +41,23 @@ class CONTENT_EXPORT AsyncResourceHandler : public ResourceHandler,
   bool OnMessageReceived(const IPC::Message& message) override;
 
   // ResourceHandler implementation:
-  bool OnRequestRedirected(const net::RedirectInfo& redirect_info,
-                           ResourceResponse* response,
-                           bool* defer) override;
-  bool OnResponseStarted(ResourceResponse* response, bool* defer) override;
-  bool OnWillStart(const GURL& url, bool* defer) override;
+  void OnRequestRedirected(
+      const net::RedirectInfo& redirect_info,
+      ResourceResponse* response,
+      std::unique_ptr<ResourceController> controller) override;
+  void OnResponseStarted(
+      ResourceResponse* response,
+      std::unique_ptr<ResourceController> controller) override;
+  void OnWillStart(const GURL& url,
+                   std::unique_ptr<ResourceController> controller) override;
   bool OnWillRead(scoped_refptr<net::IOBuffer>* buf,
                   int* buf_size,
                   int min_size) override;
-  bool OnReadCompleted(int bytes_read, bool* defer) override;
-  void OnResponseCompleted(const net::URLRequestStatus& status,
-                           bool* defer) override;
+  void OnReadCompleted(int bytes_read,
+                       std::unique_ptr<ResourceController> controller) override;
+  void OnResponseCompleted(
+      const net::URLRequestStatus& status,
+      std::unique_ptr<ResourceController> controller) override;
   void OnDataDownloaded(int bytes_downloaded) override;
 
  private:
@@ -63,7 +70,7 @@ class CONTENT_EXPORT AsyncResourceHandler : public ResourceHandler,
 
   bool EnsureResourceBufferIsInitialized();
   void ResumeIfDeferred();
-  void OnDefer();
+  void OnDefer(std::unique_ptr<ResourceController> controller);
   bool CheckForSufficientResource();
   int CalculateEncodedDataLengthToReport();
   int CalculateEncodedBodyLengthToReport();
@@ -85,8 +92,6 @@ class CONTENT_EXPORT AsyncResourceHandler : public ResourceHandler,
 
   bool first_chunk_read_ = false;
 
-  bool did_defer_;
-
   bool has_checked_for_sufficient_resources_;
   bool sent_received_response_msg_;
   bool sent_data_buffer_msg_;