Refactor ResourceHandler API.

content/browser/download/save_file_resource_handler.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 CONTENT_BROWSER_DOWNLOAD_SAVE_FILE_RESOURCE_HANDLER_H_
 #define CONTENT_BROWSER_DOWNLOAD_SAVE_FILE_RESOURCE_HANDLER_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 32 matching lines @@
                           int render_process_host_id,
                           int render_frame_routing_id,
                           const GURL& url,
                           AuthorizationState authorization_state);
   ~SaveFileResourceHandler() override;
 
   // ResourceHandler Implementation:
 
   // Saves the redirected URL to final_url_, we need to use the original
   // URL to match original request.
-  bool OnRequestRedirected(const net::RedirectInfo& redirect_info,
-                           ResourceResponse* response,
-                           bool* defer) override;
+  void OnRequestRedirected(
+      const net::RedirectInfo& redirect_info,
+      ResourceResponse* response,
+      std::unique_ptr<ResourceController> controller) override;

[Charlie Harrison, 2017/01/25 20:22:59]

nit: fwd declare ResourceController.

[mmenke, 2017/01/25 22:07:58]

Done.

 
   // Sends the download creation information to the download thread.
-  bool OnResponseStarted(ResourceResponse* response, bool* defer) override;
+  void OnResponseStarted(
+      ResourceResponse* response,
+      std::unique_ptr<ResourceController> controller) override;
 
   // Pass-through implementation.
-  bool OnWillStart(const GURL& url, bool* defer) override;
+  void OnWillStart(const GURL& url,
+                   std::unique_ptr<ResourceController> controller) override;
 
   // Creates a new buffer, which will be handed to the download thread for file
   // writing and deletion.
   bool OnWillRead(scoped_refptr<net::IOBuffer>* buf,
                   int* buf_size,
                   int min_size) override;
 
   // Passes the buffer to the download file writer.
-  bool OnReadCompleted(int bytes_read, bool* defer) override;
+  void OnReadCompleted(int bytes_read,
+                       std::unique_ptr<ResourceController> controller) override;
 
-  void OnResponseCompleted(const net::URLRequestStatus& status,
-                           bool* defer) override;
+  void OnResponseCompleted(
+      const net::URLRequestStatus& status,
+      std::unique_ptr<ResourceController> controller) override;
 
   // N/A to this flavor of SaveFileResourceHandler.
   void OnDataDownloaded(int bytes_downloaded) override;
 
   // If the content-length header is not present (or contains something other
   // than numbers), StringToInt64 returns 0, which indicates 'unknown size' and
   // is handled correctly by the SaveManager.
   void set_content_length(const std::string& content_length);
 
   void set_content_disposition(const std::string& content_disposition) {
@@ skipping 15 matching lines @@
   AuthorizationState authorization_state_;
 
   static const int kReadBufSize = 32768;  // bytes
 
   DISALLOW_COPY_AND_ASSIGN(SaveFileResourceHandler);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_DOWNLOAD_SAVE_FILE_RESOURCE_HANDLER_H_