| Index: chrome/browser/prefs/pref_service.cc
|
| diff --git a/chrome/browser/prefs/pref_service.cc b/chrome/browser/prefs/pref_service.cc
|
| index 10d7078989cfa4f7af59f96d16424134a12e45fb..e729f98917d5f9fd51ed402e286ba045f037a7cc 100644
|
| --- a/chrome/browser/prefs/pref_service.cc
|
| +++ b/chrome/browser/prefs/pref_service.cc
|
| @@ -16,6 +16,7 @@
|
| #include "base/stl_util.h"
|
| #include "base/string_number_conversions.h"
|
| #include "base/string_util.h"
|
| +#include "base/threading/sequenced_worker_pool.h"
|
| #include "base/value_conversions.h"
|
| #include "build/build_config.h"
|
| #include "chrome/browser/browser_process.h"
|
| @@ -124,7 +125,8 @@ PrefService* PrefService::CreatePrefService(
|
| const FilePath& pref_filename,
|
| policy::PolicyService* policy_service,
|
| PrefStore* extension_prefs,
|
| - bool async) {
|
| + bool async,
|
| + base::SequencedTaskRunner* sequenced_task_runner) {
|
| using policy::ConfigurationPolicyPrefStore;
|
|
|
| #if defined(OS_LINUX)
|
| @@ -154,9 +156,8 @@ PrefService* PrefService::CreatePrefService(
|
|
|
| CommandLinePrefStore* command_line =
|
| new CommandLinePrefStore(CommandLine::ForCurrentProcess());
|
| - JsonPrefStore* user = new JsonPrefStore(
|
| - pref_filename,
|
| - BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
|
| + JsonPrefStore* user = JsonPrefStore::Create(
|
| + pref_filename, sequenced_task_runner);
|
| DefaultPrefStore* default_pref_store = new DefaultPrefStore();
|
|
|
| PrefNotifierImpl* pref_notifier = new PrefNotifierImpl();
|
|
|