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

Unified Diff: ash/test/ash_test_base.cc

Issue 584213002: Only do aggressive metro viewer termination in tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comment Created 6 years, 3 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 | « no previous file | win8/metro_driver/chrome_app_view_ash.cc » ('j') | win8/viewer/metro_viewer_process_host.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_base.cc
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index 166e2b7d007df4a1aebf69a5e40342c9c753bfae..fb2eb25d4e4ad6babf25073e93c0a40792e02bee 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -147,7 +147,7 @@ void AshTestBase::SetUp() {
ipc_thread_->StartWithOptions(options);
metro_viewer_host_.reset(
new TestMetroViewerProcessHost(ipc_thread_->message_loop_proxy()));
- CHECK(metro_viewer_host_->LaunchViewerAndWaitForConnection(
+ CHECK(metro_viewer_host_->LaunchViewerAndWaitForConnectionForTests(
win8::test::kDefaultTestAppUserModelId));
aura::RemoteWindowTreeHostWin* window_tree_host =
aura::RemoteWindowTreeHostWin::Instance();
« no previous file with comments | « no previous file | win8/metro_driver/chrome_app_view_ash.cc » ('j') | win8/viewer/metro_viewer_process_host.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698