diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-19 17:16:10 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-19 17:16:10 +0000 |
| commit | 1b51720a8f40618cdc13fbb295e56ef9909a0c63 (patch) | |
| tree | 136763299c1673989ff577333f0e43d3aab23d2b /content/browser/plugin_service_impl.h | |
| parent | 166ccde782c9603bfda23edd922d467a47f08cef (diff) | |
| download | chromium_src-1b51720a8f40618cdc13fbb295e56ef9909a0c63.zip chromium_src-1b51720a8f40618cdc13fbb295e56ef9909a0c63.tar.gz chromium_src-1b51720a8f40618cdc13fbb295e56ef9909a0c63.tar.bz2 | |
Disable the failing linux aura browser tests so that it can be enabled on the bots. Most of the failing tests are related to task maanger and full screen.
I disabled the use of the plugin loader process for Aura builds, since it seems unnecessary (i.e. don't need to pay cost of extra process and complexity given that unstable NPAPI plugins aren't loaded).
BUG=163931
Review URL: https://codereview.chromium.org/11635006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173936 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/plugin_service_impl.h')
| -rw-r--r-- | content/browser/plugin_service_impl.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/content/browser/plugin_service_impl.h b/content/browser/plugin_service_impl.h index 9c4d501..1b7edfa 100644 --- a/content/browser/plugin_service_impl.h +++ b/content/browser/plugin_service_impl.h @@ -172,11 +172,9 @@ class CONTENT_EXPORT PluginServiceImpl void RegisterPepperPlugins(); -#if defined(OS_WIN) // Run on the blocking pool to load the plugins synchronously. void GetPluginsInternal(base::MessageLoopProxy* target_loop, const GetPluginsCallback& callback); -#endif // Binding directly to GetAllowedPluginForOpenChannelToPlugin() isn't possible // because more arity is needed <http://crbug.com/98542>. This just forwards. @@ -235,10 +233,9 @@ class CONTENT_EXPORT PluginServiceImpl std::set<PluginProcessHost::Client*> pending_plugin_clients_; -#if defined(OS_WIN) // Used to sequentialize loading plug-ins from disk. base::SequencedWorkerPool::SequenceToken plugin_list_token_; -#endif + #if defined(OS_POSIX) scoped_refptr<PluginLoaderPosix> plugin_loader_; #endif |