Remove NPChannelBase from cache on error.

content/common/np_channel_base.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/common/np_channel_base.h"
 
 #include <stack>
 
 #include "base/auto_reset.h"
 #include "base/hash_tables.h"
@@ skipping 235 matching lines @@
 }
 
 bool NPChannelBase::OnControlMessageReceived(const IPC::Message& msg) {
   NOTREACHED() <<
       "should override in subclass if you care about control messages";
   return false;
 }
 
 void NPChannelBase::OnChannelError() {
   channel_valid_ = false;
+
+  // TODO(shess): http://crbug.com/97285
+  // Once an error is seen on a channel, remap the channel to prevent
+  // it from being vended again.  Keep the channel in the map so
+  // RemoveRoute() can clean things up correctly.
+  for (ChannelMap::iterator iter = g_channels.Get().begin();
+       iter != g_channels.Get().end(); ++iter) {
+    if (iter->second == this) {
+      // Insert new element before invalidating |iter|.
+      g_channels.Get()[iter->first + "-error"] = iter->second;
+      g_channels.Get().erase(iter);
+      break;
+    }
+  }
 }
 
 NPObject* NPChannelBase::GetExistingNPObjectProxy(int route_id) {
   ProxyMap::iterator iter = proxy_map_.find(route_id);
   return iter != proxy_map_.end() ? iter->second : NULL;
 }
 
 int NPChannelBase::GetExistingRouteForNPObjectStub(NPObject* npobject) {
   StubMap::iterator iter = stub_map_.find(npobject);
   return iter != stub_map_.end() ? iter->second : MSG_ROUTING_NONE;
@@ skipping 12 matching lines @@
 
 void NPChannelBase::RemoveMappingForNPObjectStub(int route_id,
                                                  NPObject* object) {
   DCHECK(object != NULL);
   stub_map_.erase(object);
 }
 
 void NPChannelBase::RemoveMappingForNPObjectProxy(int route_id) {
   proxy_map_.erase(route_id);
 }