Retry channel setup for NPAPI plugins.

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 100 matching lines @@
 
 base::WaitableEvent* NPChannelBase::GetModalDialogEvent(
     gfx::NativeViewId containing_window) {
   return NULL;
 }
 
 bool NPChannelBase::Init(base::MessageLoopProxy* ipc_message_loop,
                          bool create_pipe_now,
                          base::WaitableEvent* shutdown_event) {
 #if defined(OS_POSIX)
-  // Check the validity of fd for bug investigation.  Remove after fixed.
-  // See crbug.com/97285 for details.
-  if (mode_ == IPC::Channel::MODE_CLIENT)
-    CHECK_NE(-1, channel_handle_.socket.fd);
+  // Attempting to initialize with an invalid channel handle.
+  // See http://crbug.com/97285 for details.
+  if (mode_ == IPC::Channel::MODE_CLIENT && -1 == channel_handle_.socket.fd)
+    return false;
 #endif
 
   channel_.reset(new IPC::SyncChannel(
       channel_handle_, mode_, this, ipc_message_loop, create_pipe_now,
       shutdown_event));
 
 #if defined(OS_POSIX)
   // Check the validity of fd for bug investigation.  Remove after fixed.
   // See crbug.com/97285 for details.
   if (mode_ == IPC::Channel::MODE_SERVER)
@@ skipping 158 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);
 }