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

content/browser/plugin_loader_posix.cc

Index: content/browser/plugin_loader_posix.cc
===================================================================
--- content/browser/plugin_loader_posix.cc	(revision 106976)
+++ content/browser/plugin_loader_posix.cc	(working copy)
@@ -45,7 +45,6 @@
   canonical_list_.erase(canonical_list_.begin(),
                         canonical_list_.begin() + next_load_index_ + 1);
   next_load_index_ = 0;
-
   LoadPluginsInternal();
 }
 
@@ -83,11 +82,6 @@
 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();
 
@@ -112,7 +106,7 @@
 
   ++next_load_index_;
 
-  MaybeRunPendingCallbacks();
+  RunPendingCallbacks();
 }
 
 void PluginLoaderPosix::OnPluginLoadFailed(const FilePath& plugin_path) {
@@ -125,7 +119,7 @@
   ++next_load_index_;
 
   MaybeAddInternalPlugin(plugin_path);
-  MaybeRunPendingCallbacks();
+  RunPendingCallbacks();
 }
 
 bool PluginLoaderPosix::MaybeAddInternalPlugin(const FilePath& plugin_path) {
@@ -142,9 +136,9 @@
   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();
@@ -159,8 +153,6 @@
                   (base::TimeTicks::Now() - load_start_time_)
                       * base::Time::kMicrosecondsPerMillisecond);
   load_start_time_ = base::TimeTicks();
-
-  return true;
 }
 
 PluginLoaderPosix::PendingCallback::PendingCallback(