diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 17:36:30 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 17:36:30 +0000 |
| commit | 10b833ebf1528dbfd186018c66961956bd2a9e39 (patch) | |
| tree | fcf3bd5c31c45e7472ae8c4445a796990693be49 /chrome/browser/extensions/extension_override_apitest.cc | |
| parent | 2b833518315d574e12ec8120785116da2d0bf993 (diff) | |
| download | chromium_src-10b833ebf1528dbfd186018c66961956bd2a9e39.zip chromium_src-10b833ebf1528dbfd186018c66961956bd2a9e39.tar.gz chromium_src-10b833ebf1528dbfd186018c66961956bd2a9e39.tar.bz2 | |
Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests
on win,linux,mac.
Original change: Rename TabContents::controller() to GetController and put it into the WebContents namespace.
BUG=98716
TBR=dpranke
Review URL: http://codereview.chromium.org/8956050
TBR=jam
Review URL: http://codereview.chromium.org/9018016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115346 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_override_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_override_apitest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/extensions/extension_override_apitest.cc b/chrome/browser/extensions/extension_override_apitest.cc index f11795e..778ec2e 100644 --- a/chrome/browser/extensions/extension_override_apitest.cc +++ b/chrome/browser/extensions/extension_override_apitest.cc @@ -47,8 +47,8 @@ class ExtensionOverrideTest : public ExtensionApiTest { void NavigateToKeyboard() { ui_test_utils::NavigateToURL(browser(), GURL("chrome://keyboard/")); TabContents* tab = browser()->GetSelectedTabContents(); - ASSERT_TRUE(tab->GetController().GetActiveEntry()); - EXPECT_TRUE(tab->GetController().GetActiveEntry()->url(). + ASSERT_TRUE(tab->controller().GetActiveEntry()); + EXPECT_TRUE(tab->controller().GetActiveEntry()->url(). SchemeIs(chrome::kExtensionScheme)); } #endif @@ -62,8 +62,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, OverrideNewtab) { // will call chrome.test.notifyPass() . ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab/")); TabContents* tab = browser()->GetSelectedTabContents(); - ASSERT_TRUE(tab->GetController().GetActiveEntry()); - EXPECT_TRUE(tab->GetController().GetActiveEntry()->url(). + ASSERT_TRUE(tab->controller().GetActiveEntry()); + EXPECT_TRUE(tab->controller().GetActiveEntry()->url(). SchemeIs(chrome::kExtensionScheme)); ASSERT_TRUE(catcher.GetNextResult()); @@ -89,8 +89,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, MAYBE_OverrideNewtabIncognito) { Browser* otr_browser = BrowserList::FindTabbedBrowser( browser()->profile()->GetOffTheRecordProfile(), false); TabContents* tab = otr_browser->GetSelectedTabContents(); - ASSERT_TRUE(tab->GetController().GetActiveEntry()); - EXPECT_FALSE(tab->GetController().GetActiveEntry()->url(). + ASSERT_TRUE(tab->controller().GetActiveEntry()); + EXPECT_FALSE(tab->controller().GetActiveEntry()->url(). SchemeIs(chrome::kExtensionScheme)); } |