diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-04 15:49:08 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-04 15:49:08 +0000 |
| commit | 36fb2c7c17069ad7b6d767e4c40b8ee29b762cf8 (patch) | |
| tree | 2e87bed9b96d30210008b64fde9e90fe7d6a399d /chrome/browser/browser_browsertest.cc | |
| parent | 2bd51de1a5ffc4514a11c3f18c7e2e5f1b92d728 (diff) | |
| download | chromium_src-36fb2c7c17069ad7b6d767e4c40b8ee29b762cf8.zip chromium_src-36fb2c7c17069ad7b6d767e4c40b8ee29b762cf8.tar.gz chromium_src-36fb2c7c17069ad7b6d767e4c40b8ee29b762cf8.tar.bz2 | |
Get rid of extensions dependency from content\browser.
BUG=76789
Review URL: http://codereview.chromium.org/6693054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80315 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_browsertest.cc')
| -rw-r--r-- | chrome/browser/browser_browsertest.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc index eef69ef..4b1c38c 100644 --- a/chrome/browser/browser_browsertest.cc +++ b/chrome/browser/browser_browsertest.cc @@ -12,6 +12,7 @@ #include "chrome/browser/defaults.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h" +#include "chrome/browser/extensions/extension_tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tabs/pinned_tab_codec.h" #include "chrome/browser/tabs/tab_strip_model.h" @@ -490,7 +491,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, TabClosingWhenRemovingExtension) { TabContentsWrapper* app_contents = Browser::TabContentsFactory(browser()->profile(), NULL, MSG_ROUTING_NONE, NULL, NULL); - app_contents->tab_contents()->SetExtensionApp(extension_app); + app_contents->extension_tab_helper()->SetExtensionApp(extension_app); model->AddTabContents(app_contents, 0, 0, TabStripModel::ADD_NONE); model->SetTabPinned(0, true); @@ -611,7 +612,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) { TabContentsWrapper* app_contents = Browser::TabContentsFactory(browser()->profile(), NULL, MSG_ROUTING_NONE, NULL, NULL); - app_contents->tab_contents()->SetExtensionApp(extension_app); + app_contents->extension_tab_helper()->SetExtensionApp(extension_app); model->AddTabContents(app_contents, 0, 0, TabStripModel::ADD_NONE); model->SetTabPinned(0, true); ui_test_utils::NavigateToURL(browser(), url); @@ -664,7 +665,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) { new_model->GetTabContentsAt(2)->tab_contents()->GetURL()); EXPECT_TRUE( - new_model->GetTabContentsAt(0)->tab_contents()->extension_app() == + new_model->GetTabContentsAt(0)->extension_tab_helper()->extension_app() == extension_app); } #endif // !defined(OS_CHROMEOS) @@ -696,7 +697,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, OpenAppWindowLikeNtp) { // Apps launched in a window from the NTP do not have extension_app set in // tab contents. - EXPECT_FALSE(app_window->extension_app()); + TabContentsWrapper* wrapper = + TabContentsWrapper::GetCurrentWrapperForContents(app_window); + EXPECT_FALSE(wrapper->extension_tab_helper()->extension_app()); EXPECT_EQ(extension_app->GetFullLaunchURL(), app_window->GetURL()); // The launch should have created a new browser. |