AssociatedURLLoader shouldn't derive from WebURLLoader

extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc

 // Copyright 2014 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.
 
 #include "extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.h"
 
 #include <map>
 #include <set>
 
 #include "base/macros.h"
 #include "components/guest_view/common/guest_view_constants.h"
 #include "components/guest_view/common/guest_view_messages.h"
 #include "content/public/child/v8_value_converter.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_constants.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/guest_view/extensions_guest_view_messages.h"
 #include "gin/arguments.h"
 #include "gin/dictionary.h"
 #include "gin/handle.h"
 #include "gin/interceptor.h"
 #include "gin/object_template_builder.h"
 #include "gin/wrappable.h"
+#include "third_party/WebKit/public/web/WebAssociatedURLLoader.h"
+#include "third_party/WebKit/public/web/WebAssociatedURLLoaderOptions.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebRemoteFrame.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
 namespace extensions {
 
 namespace {
 
 const char kPostMessageName[] = "postMessage";
@@ skipping 103 matching lines @@
 
   return std::vector<MimeHandlerViewContainer*>(it->second.begin(),
                                                 it->second.end());
 }
 
 void MimeHandlerViewContainer::OnReady() {
   if (!render_frame() || !is_embedded_)
     return;
 
   blink::WebFrame* frame = render_frame()->GetWebFrame();
-  blink::WebURLLoaderOptions options;
+  blink::WebAssociatedURLLoaderOptions options;
   // The embedded plugin is allowed to be cross-origin and we should always
   // send credentials/cookies with the request.
   options.crossOriginRequestPolicy =
-      blink::WebURLLoaderOptions::CrossOriginRequestPolicyAllow;
+      blink::WebAssociatedURLLoaderOptions::CrossOriginRequestPolicyAllow;
   options.allowCredentials = true;
   DCHECK(!loader_);
   loader_.reset(frame->createAssociatedURLLoader(options));
 
   blink::WebURLRequest request(original_url_);
   request.setRequestContext(blink::WebURLRequest::RequestContextObject);
   loader_->loadAsynchronously(request, this);
 }
 
 bool MimeHandlerViewContainer::OnMessage(const IPC::Message& message) {
@@ skipping 34 matching lines @@
 v8::Local<v8::Object> MimeHandlerViewContainer::V8ScriptableObject(
     v8::Isolate* isolate) {
   if (scriptable_object_.IsEmpty()) {
     v8::Local<v8::Object> object =
         ScriptableObject::Create(isolate, weak_factory_.GetWeakPtr());
     scriptable_object_.Reset(isolate, object);
   }
   return v8::Local<v8::Object>::New(isolate, scriptable_object_);
 }
 
-void MimeHandlerViewContainer::didReceiveData(blink::WebURLLoader* /* unused */,
-                                              const char* data,
-                                              int data_length,
-                                              int /* unused */,
-                                              int /* unused */) {
+void MimeHandlerViewContainer::didReceiveData(const char* data,
+                                              int data_length) {
   view_id_ += std::string(data, data_length);
 }
 
-void MimeHandlerViewContainer::didFinishLoading(
-    blink::WebURLLoader* /* unused */,
-    double /* unused */,
-    int64_t /* unused */) {
+void MimeHandlerViewContainer::didFinishLoading(double /* unused */) {
   DCHECK(is_embedded_);
   CreateMimeHandlerViewGuest();
 }
 
 void MimeHandlerViewContainer::PostMessage(v8::Isolate* isolate,
                                            v8::Local<v8::Value> message) {
   if (!guest_loaded_) {
     pending_messages_.push_back(v8::Global<v8::Value>(isolate, message));
     return;
   }
@@ skipping 106 matching lines @@
   if (!render_frame())
     return;
 
   render_frame()->Send(
       new ExtensionsGuestViewHostMsg_CreateMimeHandlerViewGuest(
           render_frame()->GetRoutingID(), view_id_, element_instance_id(),
           element_size_));
 }
 
 }  // namespace extensions