summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-01 21:36:09 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-01 21:36:09 +0000
commit1e1a3ce6a6e266ce93b78fa3c0534aec3db3e2c3 (patch)
treead152033a80281ab0d1f249ec382f8896d87a912
parent97166d1a7d679412a5437d942c126dc2192da8f6 (diff)
downloadchromium_src-1e1a3ce6a6e266ce93b78fa3c0534aec3db3e2c3.zip
chromium_src-1e1a3ce6a6e266ce93b78fa3c0534aec3db3e2c3.tar.gz
chromium_src-1e1a3ce6a6e266ce93b78fa3c0534aec3db3e2c3.tar.bz2
Fix ChromeFrame perf tests which now crash because of a recent change to the UITest suite.
BUG=none TEST=ChromeFrame perf tests should run to completion. TBR=amit Review URL: http://codereview.chromium.org/6286022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73343 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/ui/ui_test.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 0b66bd3..7161942 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -129,7 +129,8 @@ void UITestBase::SetUp() {
}
void UITestBase::TearDown() {
- launcher_->TerminateConnection();
+ if (launcher_.get())
+ launcher_->TerminateConnection();
// Make sure that we didn't encounter any assertion failures
logging::AssertionList assertions;