diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-24 21:06:16 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-24 21:06:16 +0000 |
| commit | 95e9507072023e073c06b109a222ea7b1f0e4f3b (patch) | |
| tree | c9f6faaf249b71bff024d4836cdfdf0f83b4da8b /content/browser/plugin_service.cc | |
| parent | e7a51bf1cb4d6047a0d1971bfa7b17fb1055ac2d (diff) | |
| download | chromium_src-95e9507072023e073c06b109a222ea7b1f0e4f3b.zip chromium_src-95e9507072023e073c06b109a222ea7b1f0e4f3b.tar.gz chromium_src-95e9507072023e073c06b109a222ea7b1f0e4f3b.tar.bz2 | |
Revert 106962 - Broke plugin_tests - [Linux] Load plugins out-of-process.
This also fixes a bug in PluginLoaderPosix where if the last N plugins in the
canonical list crash, the callbacks are never run.
BUG=17863
TEST=On Linux, plugins work as before.
Review URL: http://codereview.chromium.org/8372015
TBR=rsesek@chromium.org
Review URL: http://codereview.chromium.org/8351014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106977 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/plugin_service.cc')
| -rw-r--r-- | content/browser/plugin_service.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/browser/plugin_service.cc b/content/browser/plugin_service.cc index 84a318c..52ce8550 100644 --- a/content/browser/plugin_service.cc +++ b/content/browser/plugin_service.cc @@ -66,7 +66,8 @@ static void GetPluginsForGroupsCallback( // 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."; @@ -498,7 +499,7 @@ 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)); |