| Index: chrome/browser/ui/search/search_delegate_unittest.cc
|
| ===================================================================
|
| --- chrome/browser/ui/search/search_delegate_unittest.cc (revision 145001)
|
| +++ chrome/browser/ui/search/search_delegate_unittest.cc (working copy)
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "base/command_line.h"
|
| #include "chrome/browser/ui/browser.h"
|
| +#include "chrome/browser/ui/browser_tabstrip.h"
|
| #include "chrome/browser/ui/search/search_model.h"
|
| #include "chrome/browser/ui/search/search_tab_helper.h"
|
| #include "chrome/browser/ui/tab_contents/tab_contents.h"
|
| @@ -26,21 +27,21 @@
|
|
|
| // Propagate change from tab's search model to browser's search model.
|
| AddTab(browser(), GURL("http://foo/0"));
|
| - TabContents* contents = browser()->GetTabContentsAt(0);
|
| + TabContents* contents = chrome::GetTabContentsAt(browser(), 0);
|
| contents->search_tab_helper()->model()->SetMode(Mode(Mode::MODE_NTP, false));
|
| EXPECT_TRUE(browser()->search_model()->mode().is_ntp());
|
|
|
| // Add second tab, make it active, and make sure its mode changes
|
| // propagate to the browser's search model.
|
| AddTab(browser(), GURL("http://foo/1"));
|
| - browser()->ActivateTabAt(1, true);
|
| - contents = browser()->GetTabContentsAt(1);
|
| + chrome::ActivateTabAt(browser(), 1, true);
|
| + contents = chrome::GetTabContentsAt(browser(), 1);
|
| contents->search_tab_helper()->model()->SetMode(
|
| Mode(Mode::MODE_SEARCH, false));
|
| EXPECT_TRUE(browser()->search_model()->mode().is_search());
|
|
|
| // The first tab is not active so changes should not propagate.
|
| - contents = browser()->GetTabContentsAt(0);
|
| + contents = chrome::GetTabContentsAt(browser(), 0);
|
| contents->search_tab_helper()->model()->SetMode(Mode(Mode::MODE_NTP, false));
|
| EXPECT_TRUE(browser()->search_model()->mode().is_search());
|
| }
|
|
|