diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-28 21:57:07 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-28 21:57:07 +0000 |
| commit | cc8723746d3f6606a2aa7a022a8ead81e9126695 (patch) | |
| tree | 142770835522925ad6844e0478257d014d57d5f9 /chrome/browser/do_not_track_browsertest.cc | |
| parent | 02430df2fe3edf17dc8f2b33f971abd292f219d8 (diff) | |
| download | chromium_src-cc8723746d3f6606a2aa7a022a8ead81e9126695.zip chromium_src-cc8723746d3f6606a2aa7a022a8ead81e9126695.tar.gz chromium_src-cc8723746d3f6606a2aa7a022a8ead81e9126695.tar.bz2 | |
Remove TabStripModel wrapper use.
BUG=167548
TEST=no functional change
Review URL: https://chromiumcodereview.appspot.com/11953065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179199 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/do_not_track_browsertest.cc')
| -rw-r--r-- | chrome/browser/do_not_track_browsertest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/do_not_track_browsertest.cc b/chrome/browser/do_not_track_browsertest.cc index fb30fcf..71fbcda 100644 --- a/chrome/browser/do_not_track_browsertest.cc +++ b/chrome/browser/do_not_track_browsertest.cc @@ -7,7 +7,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/browser_tabstrip.h" +#include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" @@ -27,7 +27,7 @@ IN_PROC_BROWSER_TEST_F(DoNotTrackTest, Simple) { ui_test_utils::NavigateToURL(browser(), url); int matches = ui_test_utils::FindInPage( - chrome::GetActiveWebContents(browser()), + browser()->tab_strip_model()->GetActiveWebContents(), string16(ASCIIToUTF16("1")), true /* forward */, false /* match case */, NULL /* ordinal */, NULL /* selection_rect */); @@ -48,7 +48,7 @@ IN_PROC_BROWSER_TEST_F(DoNotTrackTest, Redirect) { ui_test_utils::NavigateToURL(browser(), url); int matches = ui_test_utils::FindInPage( - chrome::GetActiveWebContents(browser()), + browser()->tab_strip_model()->GetActiveWebContents(), string16(ASCIIToUTF16("1")), true /* forward */, false /* match case */, NULL /* ordinal */, NULL /* selection_rect */); @@ -62,11 +62,11 @@ IN_PROC_BROWSER_TEST_F(DoNotTrackTest, DOMProperty) { prefs->SetBoolean(prefs::kEnableDoNotTrack, true); ASSERT_NO_FATAL_FAILURE(content::WaitForLoadStop( - chrome::GetActiveWebContents(browser()))); + browser()->tab_strip_model()->GetActiveWebContents())); std::string do_not_track; EXPECT_TRUE(content::ExecuteScriptAndExtractString( - chrome::GetActiveWebContents(browser()), + browser()->tab_strip_model()->GetActiveWebContents(), "window.domAutomationController.send(navigator.doNotTrack)", &do_not_track)); EXPECT_EQ("1", do_not_track); @@ -76,7 +76,7 @@ IN_PROC_BROWSER_TEST_F(DoNotTrackTest, DOMProperty) { prefs->SetBoolean(prefs::kEnableDoNotTrack, false); EXPECT_TRUE(content::ExecuteScriptAndExtractString( - chrome::GetActiveWebContents(browser()), + browser()->tab_strip_model()->GetActiveWebContents(), "window.domAutomationController.send(" " navigator.doNotTrack === null ? '0' : '1')", &do_not_track)); |