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

content/child/npapi/plugin_instance.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/child/npapi/plugin_instance.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
@@ skipping 22 matching lines @@
 PluginInstance::PluginInstance(PluginLib* plugin, const std::string& mime_type)
     : plugin_(plugin),
       npp_(0),
       host_(PluginHost::Singleton()),
       npp_functions_(plugin->functions()),
       window_handle_(0),
       windowless_(false),
       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
       drawing_model_(NPDrawingModelCoreGraphics),
 #else
       drawing_model_(NPDrawingModelQuickDraw),
 #endif
 #ifdef NP_NO_CARBON
       event_model_(NPEventModelCocoa),
 #else
       event_model_(NPEventModelCarbon),
 #endif
       currently_handled_event_(NULL),
 #endif
       task_runner_(base::ThreadTaskRunnerHandle::Get()),
       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;
 
   if (mime_type_ == kFlashPluginSwfMimeType)
     transparent_ = false;
 
   memset(&zero_padding_, 0, sizeof(zero_padding_));
 }
 
 PluginInstance::~PluginInstance() {
   CloseStreams();
 
   if (npp_ != 0) {
     delete npp_;
     npp_ = 0;
   }
 
   if (plugin_.get())
     plugin_->CloseInstance();
 }
 
 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;
 }
 
 void PluginInstance::AddStream(PluginStream* stream) {
   open_streams_.push_back(make_scoped_refptr(stream));
 }
 
 void PluginInstance::RemoveStream(PluginStream* stream) {
   if (in_close_streams_)
@@ skipping 47 matching lines @@
                            char** const param_names,
                            char** const param_values,
                            int param_count,
                            bool load_manually) {
   load_manually_ = load_manually;
   unsigned short mode = load_manually_ ? NP_FULL : NP_EMBED;
   npp_->ndata = this;
 
   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;
 }
 
 NPObject *PluginInstance::GetPluginScriptableObject() {
   NPObject *value = NULL;
   NPError error = NPP_GetValue(NPPVpluginScriptableNPObject, &value);
   if (error != NPERR_NO_ERROR || value == NULL)
     return NULL;
   return value;
 }
 
 bool PluginInstance::GetFormValue(base::string16* value) {
   // Plugins will allocate memory for the return value by using NPN_MemAlloc().
   char *plugin_value = NULL;
   NPError error = NPP_GetValue(NPPVformValue, &plugin_value);
   if (error != NPERR_NO_ERROR || !plugin_value) {
     return false;
   }
   // Assumes the result is UTF8 text, as Firefox does.
   *value = base::UTF8ToUTF16(plugin_value);
   host_->host_functions()->memfree(plugin_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;
 }
 
 // NPAPI methods
 NPError PluginInstance::NPP_New(unsigned short mode,
                                 short argc,
                                 char* argn[],
                                 char* argv[]) {
@@ skipping 99 matching lines @@
     npp_functions_->asfile(npp_, stream, fname);
   }
 
   // Creating a temporary FilePath instance on the stack as the explicit
   // FilePath constructor with StringType as an argument causes a compiler
   // error when invoked via vector push back.
   base::FilePath file_name = base::FilePath::FromUTF8Unsafe(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
   if (npp_functions_->getvalue != 0) {
     return npp_functions_->getvalue(npp_, variable, value);
   }
   return NPERR_INVALID_FUNCTABLE_ERROR;
 }
 
 NPError PluginInstance::NPP_SetValue(NPNVariable variable, void* value) {
@@ skipping 15 matching lines @@
 
 bool PluginInstance::NPP_Print(NPPrint* platform_print) {
   DCHECK(npp_functions_ != 0);
   if (npp_functions_->print != 0) {
     npp_functions_->print(npp_, platform_print);
     return true;
   }
   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);
   }
 }
 
 void PluginInstance::DidReceiveManualResponse(const GURL& url,
                                               const std::string& mime_type,
                                               const std::string& headers,
                                               uint32 expected_length,
                                               uint32 last_modified) {
   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);
 }
 
 void PluginInstance::DidReceiveManualData(const char* buffer, int length) {
   DCHECK(load_manually_);
   if (plugin_data_stream_.get() != NULL) {
     plugin_data_stream_->DidReceiveData(buffer, length, 0);
   }
 }
@@ skipping 153 matching lines @@
       }
     }
   }
   NOTREACHED();
 }
 
 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,
                                   NPCoordinateSpace source_space,
                                   double* dest_x, double* dest_y,
                                   NPCoordinateSpace dest_space) {
 #if defined(OS_MACOSX)
   CGRect main_display_bounds = CGDisplayBounds(CGMainDisplayID());
 
   double flipped_screen_x = source_x;
@@ skipping 52 matching lines @@
     *dest_x = target_x;
   if (dest_y)
     *dest_y = target_y;
   return true;
 #else
   NOTIMPLEMENTED();
   return false;
 #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