Chromium Code Reviews| Index: chrome/browser/prefs/pref_service_mock_builder.cc |
| diff --git a/chrome/browser/prefs/pref_service_mock_builder.cc b/chrome/browser/prefs/pref_service_mock_builder.cc |
| index edfe6960265ccde184651915367fae9d90f9a5c8..8aa093d1ad4217a7688c194e9646b4b5d9de01f3 100644 |
| --- a/chrome/browser/prefs/pref_service_mock_builder.cc |
| +++ b/chrome/browser/prefs/pref_service_mock_builder.cc |
| @@ -77,16 +77,19 @@ PrefServiceMockBuilder::WithCommandLine(CommandLine* command_line) { |
| PrefServiceMockBuilder& |
| PrefServiceMockBuilder::WithUserFilePrefs(const FilePath& prefs_file) { |
| - return WithUserFilePrefs(prefs_file, |
| - BrowserThread::GetMessageLoopProxyForThread( |
| - BrowserThread::FILE)); |
| + return WithUserFilePrefs( |
| + prefs_file, |
| + JsonPrefStore::GetTaskRunnerForFile(prefs_file, |
| + BrowserThread::GetBlockingPool())); |
| } |
| PrefServiceMockBuilder& |
| PrefServiceMockBuilder::WithUserFilePrefs( |
| const FilePath& prefs_file, |
| - base::MessageLoopProxy* message_loop_proxy) { |
| - user_prefs_ = new JsonPrefStore(prefs_file, message_loop_proxy); |
| + base::SequencedTaskRunner* task_runner) { |
| + user_prefs_ = JsonPrefStore::Create( |
| + prefs_file, |
|
akalin
2012/10/19 02:00:51
can these two lines fit on the previous lien?
zel
2012/10/19 18:45:07
Done.
|
| + task_runner); |
| return *this; |
| } |