diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-11 14:26:31 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-11 14:26:31 +0000 |
commit | 8c899745075cbd3a3abead137ca0b151529898a2 (patch) | |
tree | c0b33b7b1a0a1b7b430060b78b165e79700d4972 /chrome/browser/unload_uitest.cc | |
parent | 03f7f4f98a9c241ed05862158e10120bfe64472f (diff) | |
download | chromium_src-8c899745075cbd3a3abead137ca0b151529898a2.zip chromium_src-8c899745075cbd3a3abead137ca0b151529898a2.tar.gz chromium_src-8c899745075cbd3a3abead137ca0b151529898a2.tar.bz2 |
[GTTF] Add more NULL-checks to UI tests that were lacking them to avoid crashiness.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/841002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41273 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/unload_uitest.cc')
-rw-r--r-- | chrome/browser/unload_uitest.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/unload_uitest.cc b/chrome/browser/unload_uitest.cc index 880d180..b4b311c 100644 --- a/chrome/browser/unload_uitest.cc +++ b/chrome/browser/unload_uitest.cc @@ -160,6 +160,7 @@ class UnloadTest : public UITest { void LoadUrlAndQuitBrowser(const std::string& html_content, const std::wstring& expected_title = L"") { scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); + ASSERT_TRUE(browser.get()); NavigateToDataURL(html_content, expected_title); bool application_closed = false; EXPECT_TRUE(CloseBrowser(browser.get(), &application_closed)); @@ -254,6 +255,7 @@ TEST_F(UnloadTest, BrowserCloseUnload) { #if !defined(OS_LINUX) TEST_F(UnloadTest, BrowserCloseBeforeUnloadOK) { scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); + ASSERT_TRUE(browser.get()); NavigateToDataURL(BEFORE_UNLOAD_HTML, L"beforeunload"); CloseBrowserAsync(browser.get()); @@ -266,6 +268,7 @@ TEST_F(UnloadTest, BrowserCloseBeforeUnloadOK) { // CANCEL in the beforeunload confirm dialog. TEST_F(UnloadTest, BrowserCloseBeforeUnloadCancel) { scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); + ASSERT_TRUE(browser.get()); NavigateToDataURL(BEFORE_UNLOAD_HTML, L"beforeunload"); CloseBrowserAsync(browser.get()); @@ -283,6 +286,8 @@ TEST_F(UnloadTest, BrowserCloseBeforeUnloadCancel) { // if an inner frame has the focus. See crbug.com/32615. TEST_F(UnloadTest, BrowserCloseWithInnerFocusedFrame) { scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); + ASSERT_TRUE(browser.get()); + NavigateToDataURL(INNER_FRAME_WITH_FOCUS_HTML, L"innerframewithfocus"); CloseBrowserAsync(browser.get()); |