Index: chrome/browser/extensions/extension_test_message_listener.cc |
diff --git a/chrome/browser/extensions/extension_test_message_listener.cc b/chrome/browser/extensions/extension_test_message_listener.cc |
index e892ba170726325004fee2004cc29b865680c5a0..f61986e85c99b908cebd7636f12af916dbc7250b 100644 |
--- a/chrome/browser/extensions/extension_test_message_listener.cc |
+++ b/chrome/browser/extensions/extension_test_message_listener.cc |
@@ -4,6 +4,7 @@ |
#include "chrome/browser/extensions/extension_test_message_listener.h" |
+#include "base/run_loop.h" |
#include "base/strings/string_number_conversions.h" |
#include "chrome/browser/extensions/api/test/test_api.h" |
#include "chrome/common/chrome_notification_types.h" |
@@ -27,8 +28,10 @@ ExtensionTestMessageListener::~ExtensionTestMessageListener() {} |
bool ExtensionTestMessageListener::WaitUntilSatisfied() { |
if (satisfied_) |
return !failed_; |
+ base::RunLoop run_loop; |
+ quit_closure_ = run_loop.QuitClosure(); |
waiting_ = true; |
- content::RunMessageLoop(); |
+ run_loop.Run(); |
return !failed_; |
} |
@@ -63,7 +66,7 @@ void ExtensionTestMessageListener::Observe( |
} |
if (waiting_) { |
waiting_ = false; |
- MessageLoopForUI::current()->Quit(); |
+ quit_closure_.Run(); |
} |
} |
} |