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 90aa01affc5383407f2492c81dbcaa11ade82f1d..907f1399d548b6783fb931262d0e4d61b11f025d 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" |
@@ -28,8 +29,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_; |
} |
@@ -64,7 +67,7 @@ void ExtensionTestMessageListener::Observe( |
} |
if (waiting_) { |
waiting_ = false; |
- MessageLoopForUI::current()->Quit(); |
+ quit_closure_.Run(); |
} |
} |
} |