diff options
| -rw-r--r-- | chrome/browser/browser_focus_uitest.cc | 22 | ||||
| -rw-r--r-- | chrome/browser/find_in_page_controller_uitest.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/views/constrained_window_impl_interactive_uitest.cc | 2 |
3 files changed, 18 insertions, 13 deletions
diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc index fe83ed5..4b7b39a 100644 --- a/chrome/browser/browser_focus_uitest.cc +++ b/chrome/browser/browser_focus_uitest.cc @@ -64,10 +64,11 @@ TEST_F(BrowserFocusTest, BrowsersRememberFocus) { // The focus should be on the Tab contents. scoped_ptr<WindowProxy> window(automation()->GetActiveWindow()); - EXPECT_TRUE(window.get() != NULL); + ASSERT_TRUE(window.get() != NULL); scoped_ptr<BrowserProxy> browser(automation()-> GetBrowserForWindow(window.get())); + ASSERT_TRUE(browser.get() != NULL); int focused_view_id; EXPECT_TRUE(window->GetFocusedViewID(&focused_view_id)); @@ -99,10 +100,10 @@ TEST_F(BrowserFocusTest, BrowsersRememberFocus) { // Open a new browser window. EXPECT_TRUE(automation()->OpenNewBrowserWindow(SW_SHOWNORMAL)); scoped_ptr<WindowProxy> new_window(automation()->GetActiveWindow()); - EXPECT_TRUE(new_window.get() != NULL); + ASSERT_TRUE(new_window.get() != NULL); scoped_ptr<BrowserProxy> new_browser(automation()-> GetBrowserForWindow(new_window.get())); - EXPECT_TRUE(new_browser.get() != NULL); + ASSERT_TRUE(new_browser.get() != NULL); // Let's make sure we have 2 different browser windows. EXPECT_TRUE(browser->handle() != new_browser->handle()); @@ -132,9 +133,10 @@ TEST_F(BrowserFocusTest, TabsRememberFocus) { TestServer server(kDocRoot); scoped_ptr<WindowProxy> window(automation()->GetActiveWindow()); - EXPECT_TRUE(window.get() != NULL); + ASSERT_TRUE(window.get() != NULL); scoped_ptr<BrowserProxy> browser( automation()->GetBrowserForWindow(window.get())); + ASSERT_TRUE(browser.get() != NULL); // First we navigate to our test page. GURL url = server.TestServerPageW(kSimplePage); @@ -200,16 +202,18 @@ TEST_F(BrowserFocusTest, BackgroundBrowserDontStealFocus) { tab->NavigateToURL(simple_page_url); scoped_ptr<WindowProxy> window(automation()->GetActiveWindow()); - EXPECT_TRUE(window.get() != NULL); + ASSERT_TRUE(window.get() != NULL); scoped_ptr<BrowserProxy> browser( automation()->GetBrowserForWindow(window.get())); + ASSERT_TRUE(browser.get() != NULL); // Open a new browser window. EXPECT_TRUE(automation()->OpenNewBrowserWindow(SW_SHOWNORMAL)); scoped_ptr<WindowProxy> new_window(automation()->GetActiveWindow()); - EXPECT_TRUE(window.get() != NULL); + ASSERT_TRUE(window.get() != NULL); scoped_ptr<BrowserProxy> new_browser( automation()->GetBrowserForWindow(new_window.get())); + ASSERT_TRUE(new_browser.get() != NULL); GURL steal_focus_url = server.TestServerPageW(kStealFocusPage); new_browser->AppendTab(steal_focus_url); @@ -236,9 +240,10 @@ TEST_F(BrowserFocusTest, LocationBarLockFocus) { tab->NavigateToURL(url); scoped_ptr<WindowProxy> window(automation()->GetActiveWindow()); - EXPECT_TRUE(window.get() != NULL); + ASSERT_TRUE(window.get() != NULL); scoped_ptr<BrowserProxy> browser( automation()->GetBrowserForWindow(window.get())); + ASSERT_TRUE(browser.get() != NULL); // Click on the location bar. gfx::Rect bounds; @@ -267,9 +272,10 @@ TEST_F(BrowserFocusTest, FocusTraversal) { tab->NavigateToURL(url); scoped_ptr<WindowProxy> window(automation()->GetActiveWindow()); - EXPECT_TRUE(window.get() != NULL); + ASSERT_TRUE(window.get() != NULL); scoped_ptr<BrowserProxy> browser( automation()->GetBrowserForWindow(window.get())); + ASSERT_TRUE(browser.get() != NULL); // Click on the location bar. gfx::Rect bounds; diff --git a/chrome/browser/find_in_page_controller_uitest.cc b/chrome/browser/find_in_page_controller_uitest.cc index c20a220..821cdfe 100644 --- a/chrome/browser/find_in_page_controller_uitest.cc +++ b/chrome/browser/find_in_page_controller_uitest.cc @@ -129,11 +129,8 @@ TEST_F(FindInPageControllerTest, DISABLED_FindMovesOnTabClose_Issue1343052) { scoped_ptr<TabProxy> tabA(GetActiveTab()); ASSERT_TRUE(tabA->NavigateToURL(url)); - scoped_ptr<WindowProxy> window(automation()->GetActiveWindow()); - EXPECT_TRUE(window.get() != NULL); - - scoped_ptr<BrowserProxy> browser( - automation()->GetBrowserForWindow(window.get())); + scoped_ptr<BrowserProxy> browser(automation()->GetLastActiveBrowserWindow()); + ASSERT_TRUE(browser.get() != NULL); // Toggle the bookmark bar state. browser->ApplyAccelerator(IDC_SHOW_BOOKMARKS_BAR); diff --git a/chrome/browser/views/constrained_window_impl_interactive_uitest.cc b/chrome/browser/views/constrained_window_impl_interactive_uitest.cc index 3674403..7f39d1b 100644 --- a/chrome/browser/views/constrained_window_impl_interactive_uitest.cc +++ b/chrome/browser/views/constrained_window_impl_interactive_uitest.cc @@ -56,8 +56,10 @@ TEST_F(InteractiveConstrainedWindowTest, TestOpenAndResizeTo) { ASSERT_TRUE(automation()->WaitForWindowCountToBecome(2, 1000)); scoped_ptr<BrowserProxy> popup_browser(automation()->GetBrowserWindow(1)); + ASSERT_TRUE(popup_browser != NULL); scoped_ptr<WindowProxy> popup_window( automation()->GetWindowForBrowser(popup_browser.get())); + ASSERT_TRUE(popup_window != NULL); // Make sure we were created with the correct width and height. gfx::Rect rect; |