diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-29 22:22:03 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-29 22:22:03 +0000 |
| commit | 52877dbc6c22a02dc7d1dd6f22de2c2b3e7eac17 (patch) | |
| tree | f39b0d32959778625fdeb00f178061a6411213c3 /chrome/browser/prerender/prefetch_browsertest.cc | |
| parent | 78ce87fbedda14f033aaaf474b94c4966e8bf3d0 (diff) | |
| download | chromium_src-52877dbc6c22a02dc7d1dd6f22de2c2b3e7eac17.zip chromium_src-52877dbc6c22a02dc7d1dd6f22de2c2b3e7eac17.tar.gz chromium_src-52877dbc6c22a02dc7d1dd6f22de2c2b3e7eac17.tar.bz2 | |
Move tab functions off Browser into browser_tabstrip and browser_tabrestore.
http://crbug.com/133576
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10702029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145015 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prerender/prefetch_browsertest.cc')
| -rw-r--r-- | chrome/browser/prerender/prefetch_browsertest.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/chrome/browser/prerender/prefetch_browsertest.cc b/chrome/browser/prerender/prefetch_browsertest.cc index a7f13dc..87c8349 100644 --- a/chrome/browser/prerender/prefetch_browsertest.cc +++ b/chrome/browser/prerender/prefetch_browsertest.cc @@ -5,6 +5,7 @@ #include "base/command_line.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" @@ -53,8 +54,9 @@ IN_PROC_BROWSER_TEST_F(PrefetchBrowserTest, PrefetchOn) { GURL url = test_server()->GetURL(kPrefetchPage); const string16 expected_title = ASCIIToUTF16("link onload"); - ui_test_utils::TitleWatcher title_watcher(browser()->GetActiveWebContents(), - expected_title); + ui_test_utils::TitleWatcher title_watcher( + chrome::GetActiveWebContents(browser()), + expected_title); ui_test_utils::NavigateToURL(browser(), url); EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle()); @@ -65,8 +67,9 @@ IN_PROC_BROWSER_TEST_F(PrefetchBrowserTestNoPrefetching, PrefetchOff) { GURL url = test_server()->GetURL(kPrefetchPage); const string16 expected_title = ASCIIToUTF16("link onerror"); - ui_test_utils::TitleWatcher title_watcher(browser()->GetActiveWebContents(), - expected_title); + ui_test_utils::TitleWatcher title_watcher( + chrome::GetActiveWebContents(browser()), + expected_title); ui_test_utils::NavigateToURL(browser(), url); EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle()); |