summaryrefslogtreecommitdiffstats
path: root/win8/delegate_execute/command_execute_impl.cc
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-08 11:42:24 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-08 11:42:24 +0000
commit4a262ba669c0bbbcde1cafe1e7f221faab6d9c5a (patch)
tree8ebf8d212c72c3a2b2dc6b43a927a92a2eddf2ec /win8/delegate_execute/command_execute_impl.cc
parentdc69a6843ae9d710eb0aece44e710e63c4b0ae50 (diff)
downloadchromium_src-4a262ba669c0bbbcde1cafe1e7f221faab6d9c5a.zip
chromium_src-4a262ba669c0bbbcde1cafe1e7f221faab6d9c5a.tar.gz
chromium_src-4a262ba669c0bbbcde1cafe1e7f221faab6d9c5a.tar.bz2
don't launch chrome.exe when running in metro test binary
In ash_unittests, TestMetroViewerProcessHost launches the metro viewer, and the metro viewer is expected to connect back to it. By default though, it launches chrome because it normally needs to do that to have something to connect to. Normally, ash_unittests creates the pipe, so chrome.exe's pipe creation fails, and then chrome.exe shuts down when the viewer shuts down. If, however, chrome takes longer to start, then the ash_unittests test may finish, try to kill chrome.exes, then chrome.exe starts up and creates the host pipe, then the next ash_unittest test starts up, and fails because it will fail to create the pipe. To avoid this race, pass an argument to the viewer (normally "open", now in tests "test_open") that inhibits it from starting chrome.exe R=ananta@chromium.org TBR=sky@chromium.org BUG=303478,316012 Review URL: https://codereview.chromium.org/65623002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233872 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8/delegate_execute/command_execute_impl.cc')
-rw-r--r--win8/delegate_execute/command_execute_impl.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/win8/delegate_execute/command_execute_impl.cc b/win8/delegate_execute/command_execute_impl.cc
index 6e1b9be..5f6cc19 100644
--- a/win8/delegate_execute/command_execute_impl.cc
+++ b/win8/delegate_execute/command_execute_impl.cc
@@ -300,7 +300,7 @@ STDMETHODIMP CommandExecuteImpl::GetValue(enum AHE_TYPE* pahe) {
}
#if defined(USE_AURA)
- if (*pahe == AHE_IMMERSIVE)
+ if (*pahe == AHE_IMMERSIVE && verb_ != L"test_open")
LaunchChromeBrowserProcess();
#endif