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

content/browser/plugin_service.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_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
@@ skipping 48 matching lines @@
     const PluginService::GetPluginGroupsCallback& callback,
     const std::vector<webkit::WebPluginInfo>& plugins) {
   std::vector<webkit::npapi::PluginGroup> groups;
   webkit::npapi::PluginList::Singleton()->GetPluginGroups(false, &groups);
   callback.Run(groups);
 }
 
 // Callback set on the PluginList to assert that plugin loading happens on the
 // correct thread.
 void WillLoadPluginsCallback() {
-#if defined(OS_WIN)
+  // TODO(rsesek): Change these to CHECKs.
+#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MACOSX))
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 #else
   CHECK(false) << "Plugin loading should happen out-of-process.";
 #endif
 }
 
 }  // namespace
 
 #if defined(OS_MACOSX)
 static void NotifyPluginsOfActivation() {
@@ skipping 411 matching lines @@
 }
 
 void PluginService::RefreshPluginList() {
   webkit::npapi::PluginList::Singleton()->RefreshPlugins();
 }
 
 void PluginService::GetPlugins(const GetPluginsCallback& callback) {
   scoped_refptr<base::MessageLoopProxy> target_loop(
       MessageLoop::current()->message_loop_proxy());
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MACOSX))
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
       base::Bind(&PluginService::GetPluginsInternal, base::Unretained(this),
           target_loop, callback));
 #else
   std::vector<webkit::WebPluginInfo> cached_plugins;
   if (webkit::npapi::PluginList::Singleton()->GetPluginsIfNoRefreshNeeded(
           &cached_plugins)) {
     // Can't assume the caller is reentrant.
     target_loop->PostTask(FROM_HERE,
         base::Bind(&RunGetPluginsCallback, callback, cached_plugins));
@@ skipping 103 matching lines @@
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 // static
 void PluginService::RegisterFilePathWatcher(
     FilePathWatcher *watcher,
     const FilePath& path,
     FilePathWatcher::Delegate* delegate) {
   bool result = watcher->Watch(path, delegate);
   DCHECK(result);
 }
 #endif