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

content/child/npapi/plugin_instance.cc

Index: content/child/npapi/plugin_instance.cc
diff --git a/content/child/npapi/plugin_instance.cc b/content/child/npapi/plugin_instance.cc
index c6c15441a62ec3c75c2590f248ff33c675a2b824..77d0f33663944bac8daa1052b25d937e0de445cc 100644
--- a/content/child/npapi/plugin_instance.cc
+++ b/content/child/npapi/plugin_instance.cc
@@ -40,7 +40,6 @@ PluginInstance::PluginInstance(PluginLib* plugin, const std::string& mime_type)
       transparent_(true),
       webplugin_(0),
       mime_type_(mime_type),
-      get_notify_data_(0),
       use_mozilla_user_agent_(false),
 #if defined (OS_MACOSX)
 #ifdef NP_NO_QUICKDRAW
@@ -59,9 +58,7 @@ PluginInstance::PluginInstance(PluginLib* plugin, const std::string& mime_type)
       load_manually_(false),
       in_close_streams_(false),
       next_timer_id_(1),
-      next_notify_id_(0),
-      next_range_request_id_(0),
-      handles_url_redirects_(false) {
+      next_range_request_id_(0) {
   npp_ = new NPP_t();
   npp_->ndata = 0;
   npp_->pdata = 0;
@@ -86,15 +83,8 @@ PluginInstance::~PluginInstance() {
 
 PluginStreamUrl* PluginInstance::CreateStream(unsigned long resource_id,
                                               const GURL& url,
-                                              const std::string& mime_type,
-                                              int notify_id) {
-
-  bool notify;
-  void* notify_data;
-  GetNotifyData(notify_id, &notify, &notify_data);
-  PluginStreamUrl* stream = new PluginStreamUrl(
-      resource_id, url, this, notify, notify_data);
-
+                                              const std::string& mime_type) {
+  PluginStreamUrl* stream = new PluginStreamUrl(resource_id, url, this);
   AddStream(stream);
   return stream;
 }
@@ -162,12 +152,6 @@ bool PluginInstance::Start(const GURL& url,
 
   NPError err = NPP_New(mode, param_count,
       const_cast<char **>(param_names), const_cast<char **>(param_values));
-
-  if (err == NPERR_NO_ERROR) {
-    handles_url_redirects_ =
-        ((npp_functions_->version >= NPVERS_HAS_URL_REDIRECT_HANDLING) &&
-         (npp_functions_->urlredirectnotify));
-  }
   return err == NPERR_NO_ERROR;
 }
 
@@ -192,21 +176,6 @@ bool PluginInstance::GetFormValue(base::string16* value) {
   return true;
 }
 
-// WebPluginLoadDelegate methods
-void PluginInstance::DidFinishLoadWithReason(const GURL& url,
-                                             NPReason reason,
-                                             int notify_id) {
-  bool notify;
-  void* notify_data;
-  GetNotifyData(notify_id, &notify, &notify_data);
-  if (!notify) {
-    NOTREACHED();
-    return;
-  }
-
-  NPP_URLNotify(url.spec().c_str(), reason, notify_data);
-}
-
 unsigned PluginInstance::GetBackingTextureId() {
   // By default the plugin instance is not backed by an OpenGL texture.
   return 0;
@@ -326,16 +295,6 @@ void PluginInstance::NPP_StreamAsFile(NPStream* stream, const char* fname) {
   files_created_.push_back(file_name);
 }
 
-void PluginInstance::NPP_URLNotify(const char* url,
-                                   NPReason reason,
-                                   void* notifyData) {
-  DCHECK(npp_functions_ != 0);
-  DCHECK(npp_functions_->urlnotify != 0);
-  if (npp_functions_->urlnotify != 0) {
-    npp_functions_->urlnotify(npp_, url, reason, notifyData);
-  }
-}
-
 NPError PluginInstance::NPP_GetValue(NPPVariable variable, void* value) {
   DCHECK(npp_functions_ != 0);
   // getvalue is NULL for Shockwave
@@ -371,32 +330,13 @@ bool PluginInstance::NPP_Print(NPPrint* platform_print) {
   return false;
 }
 
-void PluginInstance::NPP_URLRedirectNotify(const char* url, int32_t status,
-                                           void* notify_data) {
-  DCHECK(npp_functions_ != 0);
-  if (npp_functions_->urlredirectnotify != 0) {
-    npp_functions_->urlredirectnotify(npp_, url, status, notify_data);
-  }
-}
-
 void PluginInstance::SendJavaScriptStream(const GURL& url,
                                           const std::string& result,
-                                          bool success,
-                                          int notify_id) {
-  bool notify;
-  void* notify_data;
-  GetNotifyData(notify_id, &notify, &notify_data);
-
+                                          bool success) {
   if (success) {
-    PluginStringStream *stream =
-        new PluginStringStream(this, url, notify, notify_data);
+    PluginStringStream *stream = new PluginStringStream(this, url);
     AddStream(stream);
     stream->SendToPlugin(result, "text/html");
-  } else {
-    // NOTE: Sending an empty stream here will crash MacroMedia
-    // Flash 9.  Just send the URL Notify.
-    if (notify)
-      NPP_URLNotify(url.spec().c_str(), NPRES_DONE, notify_data);
   }
 }
 
@@ -408,7 +348,7 @@ void PluginInstance::DidReceiveManualResponse(const GURL& url,
   DCHECK(load_manually_);
 
   plugin_data_stream_ =
-      CreateStream(static_cast<unsigned long>(-1), url, mime_type, 0);
+      CreateStream(static_cast<unsigned long>(-1), url, mime_type);
   plugin_data_stream_->DidReceiveResponse(mime_type, headers, expected_length,
                                           last_modified, true);
 }
@@ -582,18 +522,9 @@ void PluginInstance::RequestURL(const char* url,
                                 const char* method,
                                 const char* target,
                                 const char* buf,
-                                unsigned int len,
-                                bool notify,
-                                void* notify_data) {
-  int notify_id = 0;
-  if (notify) {
-    notify_id = ++next_notify_id_;
-    pending_requests_[notify_id] = notify_data;
-  }
-
+                                unsigned int len) {
   webplugin_->HandleURLRequest(
-      url, method, target, buf, len, notify_id, popups_allowed(),
-      notify ? handles_url_redirects_ : false);
+      url, method, target, buf, len, popups_allowed(), false);
 }
 
 bool PluginInstance::ConvertPoint(double source_x, double source_y,
@@ -666,33 +597,4 @@ bool PluginInstance::ConvertPoint(double source_x, double source_y,
 #endif
 }
 
-void PluginInstance::GetNotifyData(int notify_id,
-                                   bool* notify,
-                                   void** notify_data) {
-  PendingRequestMap::iterator iter = pending_requests_.find(notify_id);
-  if (iter != pending_requests_.end()) {
-    *notify = true;
-    *notify_data = iter->second;
-    pending_requests_.erase(iter);
-  } else {
-    *notify = false;
-    *notify_data = NULL;
-  }
-}
-
-void PluginInstance::URLRedirectResponse(bool allow, void* notify_data) {
-  // The notify_data passed in allows us to identify the matching stream.
-  std::vector<scoped_refptr<PluginStream> >::iterator stream_index;
-  for (stream_index = open_streams_.begin();
-          stream_index != open_streams_.end(); ++stream_index) {
-    PluginStream* plugin_stream = stream_index->get();
-    if (plugin_stream->notify_data() == notify_data) {
-      PluginStreamUrl* plugin_stream_url =
-          static_cast<PluginStreamUrl*>(plugin_stream);
-      plugin_stream_url->URLRedirectResponse(allow);
-      break;
-    }
-  }
-}
-
 }  // namespace content