chrome/browser/extensions/extension_override_apitest.cc - Issue 9018016: Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/extension_override_apitest.cc

Issue 9018016: Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/extension_message_service.cc ('k') | chrome/browser/extensions/extension_page_actions_module.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_override_apitest.cc

diff --git a/chrome/browser/extensions/extension_override_apitest.cc b/chrome/browser/extensions/extension_override_apitest.cc

index f11795ec672a338f700c6c4a996c6ccf901697de..778ec2e92fa46f073198d021a1bce6819e31c657 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));

}