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

Unified Diff: chrome/test/automation/proxy_launcher.cc

Issue 7980053: Don't waste time on browser that crashed before connecting to the IPC channel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: simplify Created 9 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 | « chrome/test/automation/automation_proxy.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/automation/proxy_launcher.cc
diff --git a/chrome/test/automation/proxy_launcher.cc b/chrome/test/automation/proxy_launcher.cc
index 44c636df06600e54673e39c84e4d60a639337a0b..6667f510e900d7cbffd7a24cb6849578c6e87f55 100644
--- a/chrome/test/automation/proxy_launcher.cc
+++ b/chrome/test/automation/proxy_launcher.cc
@@ -218,7 +218,7 @@ bool ProxyLauncher::LaunchAnotherBrowserBlockUntilClosed(
void ProxyLauncher::QuitBrowser() {
// If we have already finished waiting for the browser to exit
// (or it hasn't launched at all), there's nothing to do here.
- if (process_ == base::kNullProcessHandle)
+ if (process_ == base::kNullProcessHandle || !automation_proxy_.get())
return;
if (SESSION_ENDING == shutdown_type_) {
@@ -288,7 +288,7 @@ void ProxyLauncher::QuitBrowser() {
void ProxyLauncher::TerminateBrowser() {
// If we have already finished waiting for the browser to exit
// (or it hasn't launched at all), there's nothing to do here.
- if (process_ == base::kNullProcessHandle)
+ if (process_ == base::kNullProcessHandle || !automation_proxy_.get())
return;
base::TimeTicks quit_start = base::TimeTicks::Now();
« no previous file with comments | « chrome/test/automation/automation_proxy.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698