AssociatedURLLoader shouldn't derive from WebURLLoader

content/renderer/pepper/pepper_plugin_instance_impl.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_RENDERER_PEPPER_PEPPER_PLUGIN_INSTANCE_IMPL_H_
 #define CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_INSTANCE_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 39 matching lines @@
 #include "ppapi/c/private/ppp_instance_private.h"
 #include "ppapi/c/private/ppp_pdf.h"
 #include "ppapi/shared_impl/ppb_instance_shared.h"
 #include "ppapi/shared_impl/ppb_view_shared.h"
 #include "ppapi/shared_impl/singleton_resource_id.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/ppb_gamepad_api.h"
 #include "ppapi/thunk/resource_creation_api.h"
 #include "third_party/WebKit/public/platform/WebCanvas.h"
 #include "third_party/WebKit/public/platform/WebString.h"
-#include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
+#include "third_party/WebKit/public/web/WebAssociatedURLLoaderClient.h"
 #include "third_party/WebKit/public/web/WebPlugin.h"
 #include "third_party/WebKit/public/web/WebUserGestureToken.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/gfx/geometry/rect.h"
 #include "url/gurl.h"
 #include "v8/include/v8.h"
 
 struct PP_Point;
 struct _NPP;
 
@@ skipping 294 matching lines @@
 
   // Simulates an IME event at the level of RenderView which sends it back up to
   // the plugin as if it came from the user.
   bool SimulateIMEEvent(const ppapi::InputEventData& input_event);
   void SimulateImeSetCompositionEvent(const ppapi::InputEventData& input_event);
 
   // The document loader is valid when the plugin is "full-frame" and in this
   // case is non-NULL as long as the corresponding loader resource is alive.
   // This pointer is non-owning, so the loader must use set_document_loader to
   // clear itself when it is destroyed.
-  blink::WebURLLoaderClient* document_loader() const {
+  blink::WebAssociatedURLLoaderClient* document_loader() const {
     return document_loader_;
   }
-  void set_document_loader(blink::WebURLLoaderClient* loader) {
+  void set_document_loader(blink::WebAssociatedURLLoaderClient* loader) {
     document_loader_ = loader;
   }
 
   ContentDecryptorDelegate* GetContentDecryptorDelegate();
 
   void SetGraphics2DTransform(const float& scale,
                               const gfx::PointF& translation);
 
   // PluginInstance implementation
   RenderFrame* GetRenderFrame() override;
@@ skipping 175 matching lines @@
  private:
   friend class base::RefCounted<PepperPluginInstanceImpl>;
   friend class PpapiPluginInstanceTest;
   friend class PpapiUnittest;
 
   // Delete should be called by the WebPlugin before this destructor.
   ~PepperPluginInstanceImpl() override;
 
   // Class to record document load notifications and play them back once the
   // real document loader becomes available. Used only by external instances.
-  class ExternalDocumentLoader : public blink::WebURLLoaderClient {
+  class ExternalDocumentLoader : public blink::WebAssociatedURLLoaderClient {
    public:
     ExternalDocumentLoader();
     ~ExternalDocumentLoader() override;
 
-    void ReplayReceivedData(WebURLLoaderClient* document_loader);
+    void ReplayReceivedData(WebAssociatedURLLoaderClient* document_loader);
 
-    // blink::WebURLLoaderClient implementation.
-    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;
+    // blink::WebAssociatedURLLoaderClient implementation.
+    void didReceiveData(const char* data, int data_length) override;
+    void didFinishLoading(double finish_time) override;
+    void didFail(const blink::WebURLError& error) override;
 
    private:
     std::list<std::string> data_;
     bool finished_loading_;
     std::unique_ptr<blink::WebURLError> error_;
   };
 
   // Implements PPB_Gamepad_API. This is just to avoid having an excessive
   // number of interfaces implemented by PepperPluginInstanceImpl.
   class GamepadImpl : public ppapi::thunk::PPB_Gamepad_API,
@@ skipping 331 matching lines @@
   // a user gesture after it has been processed.
   PP_TimeTicks pending_user_gesture_;
   blink::WebUserGestureToken pending_user_gesture_token_;
 
   // We store the arguments so we can re-send them if we are reset to talk to
   // NaCl via the IPC NaCl proxy.
   std::vector<std::string> argn_;
   std::vector<std::string> argv_;
 
   // Non-owning pointer to the document loader, if any.
-  blink::WebURLLoaderClient* document_loader_;
+  blink::WebAssociatedURLLoaderClient* document_loader_;
   // State for deferring document loads. Used only by external instances.
   blink::WebURLResponse external_document_response_;
   std::unique_ptr<ExternalDocumentLoader> external_document_loader_;
   bool external_document_load_;
 
   // The ContentDecryptorDelegate forwards PPP_ContentDecryptor_Private
   // calls and handles PPB_ContentDecryptor_Private calls.
   std::unique_ptr<ContentDecryptorDelegate> content_decryptor_delegate_;
 
   // The link currently under the cursor.
@@ skipping 38 matching lines @@
   // view change events.
   base::WeakPtrFactory<PepperPluginInstanceImpl> view_change_weak_ptr_factory_;
   base::WeakPtrFactory<PepperPluginInstanceImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperPluginInstanceImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_INSTANCE_IMPL_H_