Index: chrome/browser/extensions/extension_prefs_unittest.cc |
diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc |
index 5a51d732490810d43291d0ade358a9ebfacd9d49..a233883f90cfab2b66723939d6d6f453c84d8d6a 100644 |
--- a/chrome/browser/extensions/extension_prefs_unittest.cc |
+++ b/chrome/browser/extensions/extension_prefs_unittest.cc |
@@ -52,10 +52,12 @@ static void AddPattern(URLPatternSet* extent, const std::string& pattern) { |
ExtensionPrefsTest::ExtensionPrefsTest() |
: ui_thread_(BrowserThread::UI, &message_loop_), |
- file_thread_(BrowserThread::FILE, &message_loop_) { |
+ file_thread_(BrowserThread::FILE, &message_loop_), |
Mattias Nissler (ping if slow)
2012/10/22 17:28:21
Have you verified that we still need the mock file
zel
2012/10/24 02:20:11
message_loop_.message_loop_proxy() parameter here
Mattias Nissler (ping if slow)
2012/10/24 13:36:16
I understand that, but is the local file_thread_ i
zel
2012/10/24 16:49:48
Yes. Removed.
|
+ prefs_(message_loop_.message_loop_proxy()) { |
} |
-ExtensionPrefsTest::~ExtensionPrefsTest() {} |
+ExtensionPrefsTest::~ExtensionPrefsTest() { |
+} |
void ExtensionPrefsTest::RegisterPreferences() {} |
@@ -71,6 +73,8 @@ void ExtensionPrefsTest::TearDown() { |
prefs_.RecreateExtensionPrefs(); |
RegisterPreferences(); |
Verify(); |
+ prefs_.pref_service()->CommitPendingWrite(); |
+ message_loop_.RunAllPending(); |
Mattias Nissler (ping if slow)
2012/10/22 17:28:21
Why are these two needed? Could use a comment.
|
} |
// Tests the LastPingDay/SetLastPingDay functions. |