Fixes Issues #5751 & #22631: NPObject identity

content/plugin/plugin_channel_base.cc

 // Copyright (c) 2009 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/plugin/plugin_channel_base.h"
 
 #include <stack>
 
 #include "base/auto_reset.h"
 #include "base/hash_tables.h"
@@ skipping 221 matching lines @@
 
 bool PluginChannelBase::OnControlMessageReceived(const IPC::Message& msg) {
   NOTREACHED() <<
       "should override in subclass if you care about control messages";
   return false;
 }
 
 void PluginChannelBase::OnChannelError() {
   channel_valid_ = false;
 }
+
+NPObject* PluginChannelBase::GetExistingProxy(int route_id) {
+  ProxyMap::iterator iter = proxy_map_.find(route_id);
+  return iter != proxy_map_.end() ? iter->second : NULL; 
+}
+
+int PluginChannelBase::GetExistingRouteForStub(NPObject* npobject) {
+  StubMap::iterator iter = stub_map_.find(npobject);
+  return iter != stub_map_.end() ? iter->second : -1;

[jam, 2011/05/20 23:22:22]

nit: better to return MSG_ROUTING_NONE than -1.  also change callers to use that

[Kelly Norton, 2011/05/23 15:02:56]

Done.

+}
+
+void PluginChannelBase::AddMappingForProxy(int route_id, NPObject* object) {
+  proxy_map_[route_id] = object;
+}
+
+void PluginChannelBase::AddMappingForStub(int route_id, NPObject* object) {
+  DCHECK(object != NULL);
+  stub_map_[object] = route_id;
+}
+
+void PluginChannelBase::RemoveMappingForStub(int route_id, NPObject* object) {
+  DCHECK(object != NULL);
+  stub_map_.erase(object);
+}
+
+void PluginChannelBase::RemoveMappingForProxy(int route_id) {
+  proxy_map_.erase(route_id);
+}