AssociatedURLLoader shouldn't derive from WebURLLoader

media/blink/resource_multibuffer_data_provider.h

 // Copyright 2015 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 MEDIA_BLINK_RESOURCE_MULTIBUFFER_DATA_PROVIDER_H_
 #define MEDIA_BLINK_RESOURCE_MULTIBUFFER_DATA_PROVIDER_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "media/blink/active_loader.h"
 #include "media/blink/media_blink_export.h"
 #include "media/blink/multibuffer.h"
 #include "media/blink/url_index.h"
-#include "third_party/WebKit/public/platform/WebURLLoader.h"
-#include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
+#include "third_party/WebKit/public/web/WebAssociatedURLLoaderClient.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "url/gurl.h"
 
+namespace blink {
+class WebAssociatedURLLoader;
+}  // namespace blink
+
 namespace media {
 
 class MEDIA_BLINK_EXPORT ResourceMultiBufferDataProvider
     : NON_EXPORTED_BASE(public MultiBuffer::DataProvider),
-      NON_EXPORTED_BASE(public blink::WebURLLoaderClient) {
+      NON_EXPORTED_BASE(public blink::WebAssociatedURLLoaderClient) {
  public:
   // NUmber of times we'll retry if the connection fails.
   enum { kMaxRetries = 30 };
 
   ResourceMultiBufferDataProvider(UrlData* url_data, MultiBufferBlockId pos);
   ~ResourceMultiBufferDataProvider() override;
 
   // Virtual for testing purposes.
   virtual void Start();
 
   // MultiBuffer::DataProvider implementation
   MultiBufferBlockId Tell() const override;
   bool Available() const override;
   int64_t AvailableBytes() const override;
   scoped_refptr<DataBuffer> Read() override;
   void SetDeferred(bool defer) override;
 
-  // blink::WebURLLoaderClient implementation.
+  // blink::WebAssociatedURLLoaderClient implementation.
   bool willFollowRedirect(
-      blink::WebURLLoader* loader,
-      blink::WebURLRequest& newRequest,
+      const blink::WebURLRequest& newRequest,
       const blink::WebURLResponse& redirectResponse) override;
-  void didSendData(blink::WebURLLoader* loader,
-                   unsigned long long bytesSent,
+  void didSendData(unsigned long long bytesSent,
                    unsigned long long totalBytesToBeSent) override;
-  void didReceiveResponse(blink::WebURLLoader* loader,
-                          const blink::WebURLResponse& response) override;
-  void didDownloadData(blink::WebURLLoader* loader,
-                       int data_length,
-                       int encoded_data_length) override;
-  void didReceiveData(blink::WebURLLoader* loader,
-                      const char* data,
-                      int data_length,
-                      int encoded_data_length,
-                      int encoded_body_length) override;
-  void didReceiveCachedMetadata(blink::WebURLLoader* loader,
-                                const char* data,
-                                int dataLength) override;
-  void didFinishLoading(blink::WebURLLoader* loader,
-                        double finishTime,
-                        int64_t total_encoded_data_length) override;
-  void didFail(blink::WebURLLoader* loader, const blink::WebURLError&) override;
+  void didReceiveResponse(const blink::WebURLResponse& response) override;
+  void didDownloadData(int data_length) override;
+  void didReceiveData(const char* data, int data_length) override;
+  void didReceiveCachedMetadata(const char* data, int dataLength) override;
+  void didFinishLoading(double finishTime) override;
+  void didFail(const blink::WebURLError&) override;
 
   // Use protected instead of private for testing purposes.
  protected:
   friend class MultibufferDataSourceTest;
   friend class ResourceMultiBufferDataProviderTest;
   friend class MockBufferedDataSource;
 
   // Callback used when we're asked to fetch data after the end of the file.
   void Terminate();
 
@@ skipping 31 matching lines @@
   int retries_;
 
   // Copy of url_data_->cors_mode()
   // const to make it obvious that redirects cannot change it.
   const UrlData::CORSMode cors_mode_;
 
   // The origin for the initial request.
   // const to make it obvious that redirects cannot change it.
   const GURL origin_;
 
-  // Keeps track of an active WebURLLoader and associated state.
+  // Keeps track of an active WebAssociatedURLLoader and associated state.
   std::unique_ptr<ActiveLoader> active_loader_;
 
-  // Injected WebURLLoader instance for testing purposes.
-  std::unique_ptr<blink::WebURLLoader> test_loader_;
+  // Injected WebAssociatedURLLoader instance for testing purposes.
+  std::unique_ptr<blink::WebAssociatedURLLoader> test_loader_;
 
   // When we encounter a redirect, this is the source of the redirect.
   GURL redirects_to_;
 
   base::WeakPtrFactory<ResourceMultiBufferDataProvider> weak_factory_;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BLINK_RESOURCE_MULTIBUFFER_DATA_PROVIDER_H_