Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(679)

Unified Diff: ios/web/webui/web_ui_mojo_inttest.mm

Issue 2750373002: Revert of Mojo: Armed Watchers (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/web/webui/mojo_facade_unittest.mm ('k') | ipc/ipc_sync_channel.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/webui/web_ui_mojo_inttest.mm
diff --git a/ios/web/webui/web_ui_mojo_inttest.mm b/ios/web/webui/web_ui_mojo_inttest.mm
index cd69059a5afa0a8722a2064b1b0af39f201a861f..64a3d1ea39bf64c7f3ca406ac382f0137b4d323b 100644
--- a/ios/web/webui/web_ui_mojo_inttest.mm
+++ b/ios/web/webui/web_ui_mojo_inttest.mm
@@ -7,7 +7,6 @@
#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#import "base/test/ios/wait_util.h"
-#include "base/threading/thread_task_runner_handle.h"
#import "ios/web/public/navigation_manager.h"
#include "ios/web/public/web_ui_ios_data_source.h"
#include "ios/web/public/webui/web_ui_ios_controller.h"
@@ -162,16 +161,7 @@
// Wait until |TestUIHandler| receives "ack" message from WebUI page.
base::test::ios::WaitUntilCondition(^{
- // Flush any pending tasks. Don't RunUntilIdle() because
- // RunUntilIdle() is incompatible with mojo::SimpleWatcher's
- // automatic arming behavior, which Mojo JS still depends upon.
- //
- // TODO(crbug.com/701875): Introduce the full watcher API to JS and get rid
- // of this hack.
- base::RunLoop loop;
- base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
- loop.QuitClosure());
- loop.Run();
+ base::RunLoop().RunUntilIdle();
return test_ui_handler()->IsFinReceived();
});
}
« no previous file with comments | « ios/web/webui/mojo_facade_unittest.mm ('k') | ipc/ipc_sync_channel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698