AssociatedURLLoader shouldn't derive from WebURLLoader

components/nacl/renderer/manifest_downloader.h

Index: components/nacl/renderer/manifest_downloader.h
diff --git a/components/nacl/renderer/manifest_downloader.h b/components/nacl/renderer/manifest_downloader.h
index aa55be91889853e6cf2b0eaca95932e51e20fb9f..ded9f1336889352a8d7ceab1b6c8e2c70980406c 100644
--- a/components/nacl/renderer/manifest_downloader.h
+++ b/components/nacl/renderer/manifest_downloader.h
@@ -10,9 +10,10 @@
 
 #include "base/callback.h"
 #include "components/nacl/renderer/ppb_nacl_private.h"
-#include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
+#include "third_party/WebKit/public/web/WebAssociatedURLLoaderClient.h"
 
 namespace blink {
+class WebAssociatedURLLoader;
 struct WebURLError;
 class WebURLLoader;
 class WebURLResponse;
@@ -22,7 +23,7 @@ namespace nacl {
 
 // Downloads a NaCl manifest (.nmf) and returns the contents of the file to
 // caller through a callback.
-class ManifestDownloader : public blink::WebURLLoaderClient {
+class ManifestDownloader : public blink::WebAssociatedURLLoaderClient {
  public:
   typedef base::Callback<void(PP_NaClError, const std::string&)> Callback;
 
@@ -32,7 +33,7 @@ class ManifestDownloader : public blink::WebURLLoaderClient {
   // for the null termination character.
   static const size_t kNaClManifestMaxFileBytes = 1024 * 1024;
 
-  ManifestDownloader(std::unique_ptr<blink::WebURLLoader> url_loader,
+  ManifestDownloader(std::unique_ptr<blink::WebAssociatedURLLoader> url_loader,
                      bool is_installed,
                      Callback cb);
   ~ManifestDownloader() override;
@@ -42,21 +43,13 @@ class ManifestDownloader : public blink::WebURLLoaderClient {
  private:
   void Close();
 
-  // WebURLLoaderClient implementation.
-  void didReceiveResponse(blink::WebURLLoader* loader,
-                          const blink::WebURLResponse& response) override;
-  void didReceiveData(blink::WebURLLoader* loader,
-                      const char* data,
-                      int data_length,
-                      int encoded_data_length,
-                      int encoded_body_length) override;
-  void didFinishLoading(blink::WebURLLoader* loader,
-                        double finish_time,
-                        int64_t total_encoded_data_length) override;
-  void didFail(blink::WebURLLoader* loader,
-               const blink::WebURLError& error) override;
+  // WebAssociatedURLLoaderClient implementation.
+  void didReceiveResponse(const blink::WebURLResponse& response) override;
+  void didReceiveData(const char* data, int data_length) override;
+  void didFinishLoading(double finish_time) override;
+  void didFail(const blink::WebURLError& error) override;
 
-  std::unique_ptr<blink::WebURLLoader> url_loader_;
+  std::unique_ptr<blink::WebAssociatedURLLoader> url_loader_;
   bool is_installed_;
   Callback cb_;
   std::string buffer_;