summaryrefslogtreecommitdiffstats
path: root/win8
diff options
context:
space:
mode:
authorscottmg <scottmg@chromium.org>2014-09-19 11:47:43 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-19 18:48:46 +0000
commit921a7f3597fbab7c94e82910bf9e7c40616b44e0 (patch)
treec64872157137b0652c0a0215a1d88d553fd71d69 /win8
parent9af92a16534e9b8e3b4056b40fc23fbcbbc5441d (diff)
downloadchromium_src-921a7f3597fbab7c94e82910bf9e7c40616b44e0.zip
chromium_src-921a7f3597fbab7c94e82910bf9e7c40616b44e0.tar.gz
chromium_src-921a7f3597fbab7c94e82910bf9e7c40616b44e0.tar.bz2
Forcibly terminate the metro viewer
On trybots, the viewer shutdown is frequently taking 16s, making ash_unittests as a whole take ~20m. Killing the viewer more aggressively makes all the tests run at the "normal" time in the 1-500ms range, dropping total time to 5-6m. R=cpu@chromium.org BUG=411147 Review URL: https://codereview.chromium.org/584513004 Cr-Commit-Position: refs/heads/master@{#295749}
Diffstat (limited to 'win8')
-rw-r--r--win8/metro_driver/chrome_app_view_ash.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/win8/metro_driver/chrome_app_view_ash.cc b/win8/metro_driver/chrome_app_view_ash.cc
index db2d9f3..991857d 100644
--- a/win8/metro_driver/chrome_app_view_ash.cc
+++ b/win8/metro_driver/chrome_app_view_ash.cc
@@ -970,6 +970,9 @@ void ChromeAppViewAsh::OnMetroExit(MetroTerminateMethod method) {
globals.app_exit->Exit();
}
+
+ // Try really hard, see http://crbug.com/411147 for details.
+ ::TerminateProcess(::GetCurrentProcess(), 0);
}
void ChromeAppViewAsh::OnInputSourceChanged() {