Chromium Code Reviews| Index: chrome/browser/extensions/extension_service_unittest.cc |
| diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc |
| index 53d6e5c8321c91660c2c75260e969605bab7b1cd..adc7578dfcda03bf73bea7b7f1a1d1505f0e7a99 100644 |
| --- a/chrome/browser/extensions/extension_service_unittest.cc |
| +++ b/chrome/browser/extensions/extension_service_unittest.cc |
| @@ -24,6 +24,7 @@ |
| #include "base/string16.h" |
| #include "base/string_number_conversions.h" |
| #include "base/string_util.h" |
| +#include "base/threading/sequenced_worker_pool.h" |
|
akalin
2012/10/19 02:00:51
this isn't needed anymore, is it?
zel
2012/10/19 18:45:07
Done.
|
| #include "base/utf_string_conversions.h" |
| #include "base/version.h" |
| #include "chrome/browser/browser_process.h" |
| @@ -409,6 +410,7 @@ ExtensionServiceTestBase::~ExtensionServiceTestBase() { |
| service_ = NULL; |
| MessageLoop::current()->RunAllPending(); |
| profile_.reset(NULL); |
| + BrowserThread::GetBlockingPool()->FlushForTesting(); |
|
akalin
2012/10/19 02:00:51
this isn't needed anymore, is it?
zel
2012/10/19 18:45:07
Done.
|
| MessageLoop::current()->RunAllPending(); |
| } |
| @@ -420,7 +422,8 @@ void ExtensionServiceTestBase::InitializeExtensionService( |
| TestingProfile::Builder profile_builder; |
| // Create a PrefService that only contains user defined preference values. |
| scoped_ptr<PrefService> prefs( |
| - PrefServiceMockBuilder().WithUserFilePrefs(pref_file).Create()); |
| + PrefServiceMockBuilder().WithUserFilePrefs( |
| + pref_file, loop_.message_loop_proxy()).Create()); |
| Profile::RegisterUserPrefs(prefs.get()); |
| chrome::RegisterUserPrefs(prefs.get()); |
| profile_builder.SetPrefService(prefs.Pass()); |