Remove support for NPObjects.

content/child/npapi/np_channel_base.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_CHILD_NPAPI_NP_CHANNEL_BASE_H_
 #define CONTENT_CHILD_NPAPI_NP_CHANNEL_BASE_H_
 
 #include <stdint.h>
 
 #include <string>
 
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process/process.h"
-#include "content/child/npapi/npobject_base.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ipc/message_router.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace content {
 
 // Encapsulates an IPC channel between a renderer and another process. Used to
 // proxy access to NP objects.
 class NPChannelBase : public IPC::Listener,
                       public IPC::Sender,
                       public base::RefCountedThreadSafe<NPChannelBase> {
  public:
-
   // WebPlugin[Delegate] call these on construction and destruction to setup
-  // the routing and manage lifetime of this object (they pass NULL for
-  // npobject). These are also called by NPObjectProxy and NPObjectStub (which
-  // pass themselves for npobject).  However the latter don't control the
-  // lifetime of this object because we don't want a leak of an NPObject to
-  // keep the channel around longer than necessary.
-  void AddRoute(int route_id, IPC::Listener* listener, NPObjectBase* npobject);
+  // the routing and manage lifetime of this object.
+  void AddRoute(int route_id, IPC::Listener* listener);
   void RemoveRoute(int route_id);
 
-  void AddMappingForNPObjectProxy(int route_id, NPObject* object);
-  void RemoveMappingForNPObjectProxy(int route_id);
-
-  void AddMappingForNPObjectStub(int route_id, NPObject* object);
-  void RemoveMappingForNPObjectStub(int route_id, NPObject* object);
-
-  void AddMappingForNPObjectOwner(int route_id, struct _NPP* owner);
-  void SetDefaultNPObjectOwner(struct _NPP* owner);
-  void RemoveMappingForNPObjectOwner(int route_id);
-
-  NPObject* GetExistingNPObjectProxy(int route_id);
-  int GetExistingRouteForNPObjectStub(NPObject* npobject);
-  struct _NPP* GetExistingNPObjectOwner(int route_id);
-  int GetExistingRouteForNPObjectOwner(struct _NPP* owner);
-
   // IPC::Sender implementation:
   bool Send(IPC::Message* msg) override;
 
   base::ProcessId peer_pid() { return channel_->GetPeerPID(); }
   IPC::ChannelHandle channel_handle() const { return channel_handle_; }
 
   // Returns the number of open NPObject channels in this process.
   static int Count();

[piman, 2016/03/23 17:28:02]

Can we remove this too?

[dcheng, 2016/03/24 03:14:08]

Done.

 
   // Returns a new route id.
   virtual int GenerateRouteID() = 0;
 
   // Returns whether the channel is valid or not. A channel is invalid
   // if it is disconnected due to a channel error.
   bool channel_valid() {
     return channel_valid_;
   }
 
   // Returns the most recent NPChannelBase to have received a message
   // in this process.
   static NPChannelBase* GetCurrentChannel();
 
   static void CleanupChannels();
 
-  // Returns the NPObjectBase object for the route id passed in.
-  // Returns NULL on failure.
-  NPObjectBase* GetNPObjectListenerForRoute(int route_id);
-
   // Returns the event that's set when a call to the renderer causes a modal
   // dialog to come up. The default implementation returns NULL. Derived
   // classes should override this method if this functionality is required.
   virtual base::WaitableEvent* GetModalDialogEvent(int render_view_id);
 
  protected:
   typedef NPChannelBase* (*ChannelFactory)();
 
   friend class base::RefCountedThreadSafe<NPChannelBase>;
 
@@ skipping 43 matching lines @@
   IPC::Channel::Mode mode_;
   // This tracks the number of routes registered without an NPObject. It's used
   // to manage the lifetime of this object. See comment for AddRoute() and
   // RemoveRoute().
   int non_npobject_count_;
   int peer_pid_;
 
   // true when in the middle of a RemoveRoute call
   bool in_remove_route_;
 
-  // Keep track of all the registered NPObjects proxies/stubs so that when the
-  // channel is closed we can inform them.
-  typedef base::hash_map<int, NPObjectBase*> ListenerMap;
-  ListenerMap npobject_listeners_;
-
-  typedef base::hash_map<int, NPObject*> ProxyMap;
-  ProxyMap proxy_map_;
-
-  typedef base::hash_map<NPObject*, int> StubMap;
-  StubMap stub_map_;
-
-  typedef base::hash_map<struct _NPP*, int> OwnerToRouteMap;
-  OwnerToRouteMap owner_to_route_;
-
-  typedef base::hash_map<int, struct _NPP*> RouteToOwnerMap;
-  RouteToOwnerMap route_to_owner_;
-
-  // Used on the plugin side to represent any object received that does
-  // not belong to a plugin instance.
-  struct _NPP* default_owner_;
-
   // Used to implement message routing functionality to WebPlugin[Delegate]
   // objects
   IPC::MessageRouter router_;
 
   // A channel is invalid if it is disconnected as a result of a channel
   // error. This flag is used to indicate the same.
   bool channel_valid_;
 
   // Track whether we're dispatching a message with the unblock flag; works like
   // a refcount, 0 when we're not.
@@ skipping 10 matching lines @@
   // have the unblock flag set, since they could be followed by a sync message
   // that won't get dispatched until the call to the renderer is complete.
   bool send_unblocking_only_during_unblock_dispatch_;
 
   DISALLOW_COPY_AND_ASSIGN(NPChannelBase);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_NPAPI_NP_CHANNEL_BASE_H_