AssociatedURLLoader shouldn't derive from WebURLLoader

components/nacl/renderer/file_downloader.cc

Index: components/nacl/renderer/file_downloader.cc
diff --git a/components/nacl/renderer/file_downloader.cc b/components/nacl/renderer/file_downloader.cc
index 5702bc7c30bd84a7e10dc05bfa9d9c175f480640..10989711980143ea865206a819297a10bad133e2 100644
--- a/components/nacl/renderer/file_downloader.cc
+++ b/components/nacl/renderer/file_downloader.cc
@@ -10,15 +10,16 @@
 #include "components/nacl/renderer/nexe_load_manager.h"
 #include "net/base/net_errors.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
-#include "third_party/WebKit/public/platform/WebURLLoader.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
+#include "third_party/WebKit/public/web/WebAssociatedURLLoader.h"
 
 namespace nacl {
 
-FileDownloader::FileDownloader(std::unique_ptr<blink::WebURLLoader> url_loader,
-                               base::File file,
-                               StatusCallback status_cb,
-                               ProgressCallback progress_cb)
+FileDownloader::FileDownloader(
+    std::unique_ptr<blink::WebAssociatedURLLoader> url_loader,
+    base::File file,
+    StatusCallback status_cb,
+    ProgressCallback progress_cb)
     : url_loader_(std::move(url_loader)),
       file_(std::move(file)),
       status_cb_(status_cb),
@@ -38,7 +39,6 @@ void FileDownloader::Load(const blink::WebURLRequest& request) {
 }
 
 void FileDownloader::didReceiveResponse(
-    blink::WebURLLoader* loader,
     const blink::WebURLResponse& response) {
   http_status_code_ = response.httpStatusCode();
   if (http_status_code_ != 200)
@@ -50,11 +50,7 @@ void FileDownloader::didReceiveResponse(
     progress_cb_.Run(total_bytes_received_, total_bytes_to_be_received_);
 }
 
-void FileDownloader::didReceiveData(blink::WebURLLoader* loader,
-                                    const char* data,
-                                    int data_length,
-                                    int encoded_data_length,
-                                    int encoded_body_length) {
+void FileDownloader::didReceiveData(const char* data, int data_length) {
   if (status_ == SUCCESS) {
     if (file_.Write(total_bytes_received_, data, data_length) == -1) {
       status_ = FAILED;
@@ -66,10 +62,7 @@ void FileDownloader::didReceiveData(blink::WebURLLoader* loader,
   }
 }
 
-void FileDownloader::didFinishLoading(
-    blink::WebURLLoader* loader,
-    double finish_time,
-    int64_t total_encoded_data_length) {
+void FileDownloader::didFinishLoading(double finish_time) {
   if (status_ == SUCCESS) {
     // Seek back to the beginning of the file that was just written so it's
     // easy for consumers to use.
@@ -80,9 +73,7 @@ void FileDownloader::didFinishLoading(
   delete this;
 }
 
-void FileDownloader::didFail(
-    blink::WebURLLoader* loader,
-    const blink::WebURLError& error) {
+void FileDownloader::didFail(const blink::WebURLError& error) {
   status_ = FAILED;
   if (error.domain.equals(blink::WebString::fromUTF8(net::kErrorDomain))) {
     switch (error.reason) {