| Index: content/browser/plugin_service_impl.h
|
| diff --git a/content/browser/plugin_service_impl.h b/content/browser/plugin_service_impl.h
|
| index 25f5719b40874167ad2225ebf9c719be377ac8f4..170157f5ac95bb8b3cde55086449f139a5ba43f6 100644
|
| --- a/content/browser/plugin_service_impl.h
|
| +++ b/content/browser/plugin_service_impl.h
|
| @@ -19,10 +19,12 @@
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| +#include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_vector.h"
|
| #include "base/memory/singleton.h"
|
| +#include "base/sequence_checker.h"
|
| +#include "base/sequenced_task_runner.h"
|
| #include "base/synchronization/waitable_event_watcher.h"
|
| -#include "base/threading/sequenced_worker_pool.h"
|
| #include "base/time/time.h"
|
| #include "build/build_config.h"
|
| #include "content/browser/ppapi_plugin_process_host.h"
|
| @@ -149,8 +151,11 @@ class CONTENT_EXPORT PluginServiceImpl
|
| // Weak pointer; outlives us.
|
| PluginServiceFilter* filter_;
|
|
|
| - // Used to sequentialize loading plugins from disk.
|
| - base::SequencedWorkerPool::SequenceToken plugin_list_token_;
|
| + // Used to load plugins from disk.
|
| + scoped_refptr<base::SequencedTaskRunner> plugin_list_task_runner_;
|
| +
|
| + // Used to verify that loading plugins from disk is done sequentially.
|
| + base::SequenceChecker plugin_list_sequence_checker_;
|
|
|
| // Used to detect if a given plugin is crashing over and over.
|
| std::map<base::FilePath, std::vector<base::Time> > crash_times_;
|
|
|