Remove PluginLoadObserver and related logic, it was only used for NPAPI.

content/renderer/npapi/webplugin_impl.cc

 // 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.
 
 #include "content/renderer/npapi/webplugin_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/crash_logging.h"
 #include "base/location.h"
@@ skipping 445 matching lines @@
 
 void WebPluginImpl::didFinishLoading() {
   delegate_->DidFinishManualLoading();
 }
 
 void WebPluginImpl::didFailLoading(const WebURLError& error) {
   if (!ignore_response_error_)
     delegate_->DidManualLoadFail();
 }
 
-void WebPluginImpl::didFinishLoadingFrameRequest(
-    const WebURL& url, void* notify_data) {
-  if (delegate_) {
-    // We're converting a void* into an arbitrary int id.  Though
-    // these types are the same size on all the platforms we support,
-    // the compiler may complain as though they are different, so to
-    // make the casting gods happy go through an intptr_t (the union
-    // of void* and int) rather than converting straight across.
-    delegate_->DidFinishLoadWithReason(
-        url, NPRES_DONE, reinterpret_cast<intptr_t>(notify_data));
-  }
-}
-
-void WebPluginImpl::didFailLoadingFrameRequest(
-    const WebURL& url, void* notify_data, const WebURLError& error) {
-  if (!delegate_)
-    return;
-
-  NPReason reason =
-      error.reason == net::ERR_ABORTED ? NPRES_USER_BREAK : NPRES_NETWORK_ERR;
-  // See comment in didFinishLoadingFrameRequest about the cast here.
-  delegate_->DidFinishLoadWithReason(
-      url, reason, reinterpret_cast<intptr_t>(notify_data));
-}
-
 bool WebPluginImpl::isPlaceholder() {
   return false;
 }
 
 WebPluginImpl::LoaderClient::LoaderClient(WebPluginImpl* parent)
     : parent_(parent) {}
 
 void WebPluginImpl::LoaderClient::willFollowRedirect(
     blink::WebURLLoader* loader, blink::WebURLRequest& new_request,
     const blink::WebURLResponse& redirect_response) {
@@ skipping 189 matching lines @@
 }
 
 WebPluginImpl::RoutingStatus WebPluginImpl::RouteToFrame(
     const char* url,
     bool is_javascript_url,
     bool popups_allowed,
     const char* method,
     const char* target,
     const char* buf,
     unsigned int len,
-    int notify_id,
     ReferrerValue referrer_flag) {
   // If there is no target, there is nothing to do
   if (!target)
     return NOT_ROUTED;
 
   // This could happen if the WebPluginContainer was already deleted.
   if (!webframe_)
     return NOT_ROUTED;
 
   WebString target_str = WebString::fromUTF8(target);
@@ skipping 43 matching lines @@
   request.setSkipServiceWorker(true);
   if (len > 0) {
     if (!SetPostData(&request, buf, len)) {
       // Uhoh - we're in trouble.  There isn't a good way
       // to recover at this point.  Break out.
       NOTREACHED();
       return ROUTED;
     }
   }
 
-  container_->loadFrameRequest(
-      request, target_str, notify_id != 0, reinterpret_cast<void*>(notify_id));
+  container_->loadFrameRequest(request, target_str);
   return ROUTED;
 }
 
 NPObject* WebPluginImpl::GetWindowScriptNPObject() {
   if (!webframe_) {
     NOTREACHED();
     return NULL;
   }
   return webframe_->windowObject();
 }
@@ skipping 119 matching lines @@
     container_->invalidate();
 }
 
 void WebPluginImpl::InvalidateRect(const gfx::Rect& rect) {
   if (container_)
     container_->invalidateRect(rect);
 }
 
 void WebPluginImpl::OnDownloadPluginSrcUrl() {
   HandleURLRequestInternal(
-      plugin_url_.spec().c_str(), "GET", NULL, NULL, 0, 0, false, DOCUMENT_URL,
+      plugin_url_.spec().c_str(), "GET", NULL, NULL, 0, false, DOCUMENT_URL,
       false, true);
 }
 
 WebPluginResourceClient* WebPluginImpl::GetClientFromLoader(
     WebURLLoader* loader) {
   ClientInfo* client_info = GetClientInfoFromLoader(loader);
   if (client_info)
     return client_info->client;
   return NULL;
 }
@@ skipping 115 matching lines @@
       // seekable streams.
       request_is_seekable = false;
 
       delete client;
       client = NULL;
 
       // Create a new resource client for this request.
       for (size_t i = 0; i < clients_.size(); ++i) {
         if (clients_[i].loader.get() == loader) {
           WebPluginResourceClient* resource_client =
-              delegate_->CreateResourceClient(clients_[i].id, plugin_url_, 0);
+              delegate_->CreateResourceClient(clients_[i].id, plugin_url_);
           clients_[i].client = resource_client;
           client = resource_client;
           break;
         }
       }
 
       DCHECK(client != NULL);
     }
   }
 
@@ skipping 104 matching lines @@
   container_ = container;
   if (container_)
     container_->allowScriptObjects();
 }
 
 void WebPluginImpl::HandleURLRequest(const char* url,
                                      const char* method,
                                      const char* target,
                                      const char* buf,
                                      unsigned int len,
-                                     int notify_id,
                                      bool popups_allowed,
                                      bool notify_redirects) {
   // GetURL/PostURL requests initiated explicitly by plugins should specify the
   // plugin SRC url as the referrer if it is available.
   HandleURLRequestInternal(
-      url, method, target, buf, len, notify_id, popups_allowed, PLUGIN_SRC,
+      url, method, target, buf, len, popups_allowed, PLUGIN_SRC,
       notify_redirects, false);
 }
 
 void WebPluginImpl::HandleURLRequestInternal(const char* url,
                                              const char* method,
                                              const char* target,
                                              const char* buf,
                                              unsigned int len,
-                                             int notify_id,
                                              bool popups_allowed,
                                              ReferrerValue referrer_flag,
                                              bool notify_redirects,
                                              bool is_plugin_src_load) {
   // For this request, we either route the output to a frame
   // because a target has been specified, or we handle the request
   // here, i.e. by executing the script if it is a javascript url
   // or by initiating a download on the URL, etc. There is one special
   // case in that the request is a javascript url and the target is "_self",
   // in which case we route the output to the plugin rather than routing it
   // to the plugin's frame.
   bool is_javascript_url =
       url::FindAndCompareScheme(url, strlen(url), url::kJavaScriptScheme, NULL);
   RoutingStatus routing_status = RouteToFrame(
       url, is_javascript_url, popups_allowed, method, target, buf, len,
-      notify_id, referrer_flag);
+      referrer_flag);
   if (routing_status == ROUTED)
     return;
 
   if (is_javascript_url) {
     GURL gurl(url);
     WebString result = container_->executeScriptURL(gurl, popups_allowed);
 
     // delegate_ could be NULL because executeScript caused the container to
     // be deleted.
     if (delegate_) {
-      delegate_->SendJavaScriptStream(
-          gurl, result.utf8(), !result.isNull(), notify_id);
+      delegate_->SendJavaScriptStream(gurl, result.utf8(), !result.isNull());
     }
 
     return;
   }
 
   unsigned long resource_id = GetNextResourceId();
   if (!resource_id)
     return;
 
   GURL complete_url = CompleteURL(url);
   // Remove when flash bug is fixed. http://crbug.com/40016.
   if (!WebPluginImpl::IsValidUrl(complete_url, referrer_flag))
     return;
 
   // If the RouteToFrame call returned a failure then inform the result
   // back to the plugin asynchronously.
   if ((routing_status == INVALID_URL) ||
       (routing_status == GENERAL_FAILURE)) {
     WebPluginResourceClient* resource_client = delegate_->CreateResourceClient(
-        resource_id, complete_url, notify_id);
+        resource_id, complete_url);
     if (resource_client)
       resource_client->DidFail(resource_id);
     return;
   }
 
   // CreateResourceClient() sends a synchronous IPC message so it's possible
   // that TearDownPluginInstance() may have been called in the nested
   // message loop.  If so, don't start the request.
   if (!delegate_)
     return;
@@ skipping 10 matching lines @@
     // TODO(jam): any better way of getting this? Can't find a way to get
     // frame()->loader()->outgoingReferrer() which
     // WebFrameImpl::setReferrerForRequest does.
     WebURLRequest request(complete_url);
     SetReferrer(&request, referrer_flag);
     Referrer referrer(
         GURL(request.httpHeaderField(WebString::fromUTF8("Referer"))),
         request.referrerPolicy());
 
     GURL first_party_for_cookies = webframe_->document().firstPartyForCookies();
-    delegate_->FetchURL(resource_id, notify_id, complete_url,
+    delegate_->FetchURL(resource_id, complete_url,
                         first_party_for_cookies, method, buf, len, referrer,
                         notify_redirects, is_plugin_src_load, 0,
                         render_frame_->GetRoutingID(),
                         render_view_->GetRoutingID());
   } else {
     WebPluginResourceClient* resource_client = delegate_->CreateResourceClient(
-        resource_id, complete_url, notify_id);
+        resource_id, complete_url);
     if (!resource_client)
       return;
     InitiateHTTPRequest(resource_id, resource_client, complete_url, method, buf,
                         len, NULL, referrer_flag, notify_redirects,
                         is_plugin_src_load);
   }
 }
 
 unsigned long WebPluginImpl::GetNextResourceId() {
   if (!webframe_)
@@ skipping 271 matching lines @@
     case PLUGIN_SRC:
       webframe_->setReferrerForRequest(*request, plugin_url_);
       break;
 
     default:
       break;
   }
 }
 
 }  // namespace content