Merge 32397 - Only clears the unblock flag on sync IPCs during other sync dis...

chrome/plugin/plugin_channel.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 "chrome/plugin/plugin_channel.h"
 
 #include "base/command_line.h"
 #include "base/lock.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
@@ skipping 143 matching lines @@
 
 PluginChannel::PluginChannel()
     : renderer_handle_(0),
       renderer_id_(-1),
 #if defined(OS_POSIX)
       renderer_fd_(-1),
 #endif
       in_send_(0),
       off_the_record_(false),
       filter_(new MessageFilter()) {
-  SendUnblockingOnlyDuringDispatch();
+  SendUnblockingOnlyDuringSyncDispatch();
   ChildProcess::current()->AddRefProcess();
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   log_messages_ = command_line->HasSwitch(switches::kLogPluginMessages);
 }
 
 PluginChannel::~PluginChannel() {
   if (renderer_handle_)
     base::CloseProcessHandle(renderer_handle_);
 #if defined(OS_POSIX)
   // If we still have the renderer FD, close it.
@@ skipping 121 matching lines @@
   int plugin_fd;
   IPC::SocketPair(&plugin_fd, &renderer_fd_);
   IPC::AddChannelSocket(channel_name(), plugin_fd);
 #endif
   if (!PluginChannelBase::Init(ipc_message_loop, create_pipe_now))
     return false;
 
   channel_->AddFilter(filter_.get());
   return true;
 }