Revert 106962 - Broke plugin_tests - [Linux] Load plugins out-of-process.

content/browser/plugin_loader_posix.cc

 // Copyright (c) 2011 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/browser/plugin_loader_posix.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/metrics/histogram.h"
@@ skipping 27 matching lines @@
     IPC_MESSAGE_HANDLER(UtilityHostMsg_LoadPluginFailed, OnPluginLoadFailed)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void PluginLoaderPosix::OnProcessCrashed(int exit_code) {
   canonical_list_.erase(canonical_list_.begin(),
                         canonical_list_.begin() + next_load_index_ + 1);
   next_load_index_ = 0;
-
   LoadPluginsInternal();
 }
 
 bool PluginLoaderPosix::Send(IPC::Message* message) {
   return process_host_->Send(message);
 }
 
 PluginLoaderPosix::~PluginLoaderPosix() {
 }
 
@@ skipping 17 matching lines @@
                  make_scoped_refptr(this)));
 
   HISTOGRAM_TIMES("PluginLoaderPosix.GetPluginList",
                   (base::TimeTicks::Now() - start_time) *
                       base::Time::kMicrosecondsPerMillisecond);
 }
 
 void PluginLoaderPosix::LoadPluginsInternal() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  // Check if the list is empty or all plugins have already been loaded before
-  // forking.
-  if (MaybeRunPendingCallbacks())
-    return;
-
   if (load_start_time_.is_null())
     load_start_time_ = base::TimeTicks::Now();
 
   process_host_ = new UtilityProcessHost(this, BrowserThread::IO);
   process_host_->set_no_sandbox(true);
 #if defined(OS_MACOSX)
   process_host_->set_child_flags(ChildProcessHost::CHILD_ALLOW_HEAP_EXECUTION);
 #endif
 
   process_host_->Send(new UtilityMsg_LoadPlugins(canonical_list_));
 }
 
 void PluginLoaderPosix::OnPluginLoaded(const webkit::WebPluginInfo& plugin) {
   if (plugin.path.value() != canonical_list_[next_load_index_].value()) {
     LOG(ERROR) << "Received unexpected plugin load message for "
                << plugin.path.value();
     return;
   }
 
   if (!MaybeAddInternalPlugin(plugin.path))
     loaded_plugins_.push_back(plugin);
 
   ++next_load_index_;
 
-  MaybeRunPendingCallbacks();
+  RunPendingCallbacks();
 }
 
 void PluginLoaderPosix::OnPluginLoadFailed(const FilePath& plugin_path) {
   if (plugin_path.value() != canonical_list_[next_load_index_].value()) {
     LOG(ERROR) << "Received unexpected plugin load failure message for "
                << plugin_path.value();
     return;
   }
 
   ++next_load_index_;
 
   MaybeAddInternalPlugin(plugin_path);
-  MaybeRunPendingCallbacks();
+  RunPendingCallbacks();
 }
 
 bool PluginLoaderPosix::MaybeAddInternalPlugin(const FilePath& plugin_path) {
   for (std::vector<webkit::WebPluginInfo>::iterator it =
            internal_plugins_.begin();
        it != internal_plugins_.end();
        ++it) {
     if (it->path == plugin_path) {
       loaded_plugins_.push_back(*it);
       internal_plugins_.erase(it);
       return true;
     }
   }
   return false;
 }
 
-bool PluginLoaderPosix::MaybeRunPendingCallbacks() {
+void PluginLoaderPosix::RunPendingCallbacks() {
   if (next_load_index_ < canonical_list_.size())
-    return false;
+    return;
 
   PluginList::Singleton()->SetPlugins(loaded_plugins_);
   for (std::vector<PendingCallback>::iterator it = callbacks_.begin();
        it != callbacks_.end();
        ++it) {
     it->target_loop->PostTask(FROM_HERE,
         base::Bind(it->callback, loaded_plugins_));
   }
   callbacks_.clear();
 
   HISTOGRAM_TIMES("PluginLoaderPosix.LoadDone",
                   (base::TimeTicks::Now() - load_start_time_)
                       * base::Time::kMicrosecondsPerMillisecond);
   load_start_time_ = base::TimeTicks();
-
-  return true;
 }
 
 PluginLoaderPosix::PendingCallback::PendingCallback(
     scoped_refptr<base::MessageLoopProxy> loop,
     const PluginService::GetPluginsCallback& cb)
     : target_loop(loop),
       callback(cb) {
 }
 
 PluginLoaderPosix::PendingCallback::~PendingCallback() {
 }