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

content/child/npapi/plugin_instance.h

Index: content/child/npapi/plugin_instance.h
diff --git a/content/child/npapi/plugin_instance.h b/content/child/npapi/plugin_instance.h
index 95589301c3b1904cdffffb5d86c106123a0d1d5b..8a6a423c78ccfaa749abe03fff41efba75c48248 100644
--- a/content/child/npapi/plugin_instance.h
+++ b/content/child/npapi/plugin_instance.h
@@ -121,15 +121,12 @@ class PluginInstance : public base::RefCountedThreadSafe<PluginInstance> {
   }
 #endif
 
-  // Creates a stream for sending an URL.  If notify_id is non-zero, it will
-  // send a notification to the plugin when the stream is complete; otherwise it
-  // will not.  Set object_url to true if the load is for the object tag's url,
-  // or false if it's for a url that the plugin fetched through
-  // NPN_GetUrl[Notify].
+  // Creates a stream for sending an URL. Set object_url to true if the load is
+  // for the object tag's url, or false if it's for a url that the plugin
+  // fetched through NPN_GetUrl[Notify].
   PluginStreamUrl* CreateStream(unsigned long resource_id,

[dcheng, 2015/11/18 18:38:18]

Then we could probably nuke this too.

[Nate Chapin, 2015/11/18 23:28:50]

Done.

                                 const GURL& url,
-                                const std::string& mime_type,
-                                int notify_id);
+                                const std::string& mime_type);
 
   // For each instance, we track all streams.  When the
   // instance closes, all remaining streams are also
@@ -155,10 +152,6 @@ class PluginInstance : public base::RefCountedThreadSafe<PluginInstance> {
   // Returns the form value of this instance.
   bool GetFormValue(base::string16* value);
 
-  // WebViewDelegate methods that we implement. This is for handling
-  // callbacks during getURLNotify.
-  void DidFinishLoadWithReason(const GURL& url, NPReason reason, int notify_id);
-
   // If true, send the Mozilla user agent instead of Chrome's to the plugin.
   bool use_mozilla_user_agent() { return use_mozilla_user_agent_; }
   void set_use_mozilla_user_agent() { use_mozilla_user_agent_ = true; }
@@ -205,8 +198,7 @@ class PluginInstance : public base::RefCountedThreadSafe<PluginInstance> {
 
   void SendJavaScriptStream(const GURL& url,
                             const std::string& result,
-                            bool success,
-                            int notify_id);
+                            bool success);
 
   void DidReceiveManualResponse(const GURL& url,
                                 const std::string& mime_type,
@@ -233,15 +225,7 @@ class PluginInstance : public base::RefCountedThreadSafe<PluginInstance> {
                   const char* method,
                   const char* target,
                   const char* buf,
-                  unsigned int len,
-                  bool notify,
-                  void* notify_data);
-
-  // Handles NPN_URLRedirectResponse calls issued by plugins in response to
-  // HTTP URL redirect notifications.
-  void URLRedirectResponse(bool allow, void* notify_data);
-
-  bool handles_url_redirects() const { return handles_url_redirects_; }
+                  unsigned int len);
 
  private:
   friend class base::RefCountedThreadSafe<PluginInstance>;
@@ -262,7 +246,6 @@ class PluginInstance : public base::RefCountedThreadSafe<PluginInstance> {
   void OnTimerCall(void (*func)(NPP id, uint32 timer_id),
                    NPP id, uint32 timer_id);
   bool IsValidStream(const NPStream* stream);
-  void GetNotifyData(int notify_id, bool* notify, void** notify_data);
 
   // This is a hack to get the real player plugin to work with chrome
   // The real player plugin dll(nppl3260) when loaded by firefox is loaded via
@@ -338,7 +321,6 @@ class PluginInstance : public base::RefCountedThreadSafe<PluginInstance> {
   // cross process boundaries to an untrusted process.
   typedef std::map<int, void*> PendingRequestMap;
   PendingRequestMap pending_requests_;
-  int next_notify_id_;
 
   // Used to track pending range requests so that when WebPlugin replies to us
   // we can match the reply to the stream.