Refactor ResourceHandler API.

content/browser/loader/test_resource_handler.h

 // Copyright 2016 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_LOADER_TEST_RESOURCE_HANDLER_H_
 #define CONTENT_BROWSER_LOADER_TEST_RESOURCE_HANDLER_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 24 matching lines @@
 class TestResourceHandler : public ResourceHandler {
  public:
   // If non-null, |request_status| will be updated when the response is complete
   // with the final status of the request received by the handler and |body|
   // will be updated on each OnReadCompleted call.
   TestResourceHandler(net::URLRequestStatus* request_status, std::string* body);
   TestResourceHandler();
   ~TestResourceHandler() override;
 
   // ResourceHandler implementation:
-  void SetController(ResourceController* controller) override;
-  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;
 
-  // Invoke the corresponding methods on the ResourceHandler's
-  // ResourceController.
   void Resume();
-  void CancelWithError(net::Error net_error);
+  void CancelWithError(net::Error error_code);
 
   // Sets the size of the read buffer returned by OnWillRead. Releases reference
   // to previous read buffer. Default size is 2048 bytes.
   void SetBufferSize(int buffer_size);
 
   scoped_refptr<net::IOBuffer> buffer() const { return buffer_; }
 
   // Sets the result returned by each method. All default to returning true.
   void set_on_will_start_result(bool on_will_start_result) {
     on_will_start_result_ = on_will_start_result;
@@ skipping 85 matching lines @@
   void WaitUntilResponseComplete();
 
  private:
   // TODO(mmenke):  Remove these, in favor of final_status_ and body_.
   net::URLRequestStatus* request_status_ptr_;
   std::string* body_ptr_;
 
   scoped_refptr<net::IOBuffer> buffer_;
   size_t buffer_size_;
 
-  ResourceController* controller_;
-
   bool on_will_start_result_ = true;
   bool on_request_redirected_result_ = true;
   bool on_response_started_result_ = true;
   bool on_will_read_result_ = true;
   bool on_read_completed_result_ = true;
   bool on_read_eof_result_ = true;
 
   bool defer_on_will_start_ = false;
   bool defer_on_request_redirected_ = false;
   bool defer_on_response_started_ = false;
@@ skipping 27 matching lines @@
   std::unique_ptr<base::RunLoop> deferred_run_loop_;
 
   base::RunLoop response_complete_run_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(TestResourceHandler);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_LOADER_TEST_RESOURCE_HANDLER_H_