diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 00:47:23 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 00:47:23 +0000 |
| commit | ee284a1c31d2dec5ae7cfb3bb79b070c54fc06b4 (patch) | |
| tree | 5192fec43a4b795821d0172bd52eab2b3a252bca /chrome/test | |
| parent | 7efe6978cc166eb68302a4db3febc4269c46f435 (diff) | |
| download | chromium_src-ee284a1c31d2dec5ae7cfb3bb79b070c54fc06b4.zip chromium_src-ee284a1c31d2dec5ae7cfb3bb79b070c54fc06b4.tar.gz chromium_src-ee284a1c31d2dec5ae7cfb3bb79b070c54fc06b4.tar.bz2 | |
Fix ChromeFrame perf redness caused by the change to move the creation of the proxy launcher
to UITest::Setup. ChromeFrame perf tests override the Setup method and don't invoke the Base
UITest::Setup implementation.
This causes a crash in UITest::TearDown invoked during the ChromeFrame perf test runs where
we crash as the launcher is NULL. Added a check for the same.
BUG=none
TEST=chrome frame perf tests.
TBR=amit
Review URL: http://codereview.chromium.org/6321010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71733 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index 851a6c4..60d4f31 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -196,7 +196,8 @@ void UITestBase::ConnectToRunningBrowser() { } void UITestBase::CloseBrowserAndServer() { - launcher_->CloseBrowserAndServer(shutdown_type_); + if (launcher_.get()) + launcher_->CloseBrowserAndServer(shutdown_type_); } void UITestBase::LaunchBrowser(const CommandLine& arguments, |