chrome/browser/extensions/extension_icon_source_apitest.cc - Issue 10535077: TabContentsWrapper -> TabContents, part 12.

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_icon_source_apitest.cc

Issue 10535077: TabContentsWrapper -> TabContents, part 12. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 years, 6 months 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

Index: chrome/browser/extensions/extension_icon_source_apitest.cc

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

index f77be4618a012e90f2cc17776d73f642c993cb4b..64f38182a39a9ff1c80f391347189a80316be60a 100644

--- a/chrome/browser/extensions/extension_icon_source_apitest.cc

+++ b/chrome/browser/extensions/extension_icon_source_apitest.cc

@@ -34,7 +34,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, IconsLoaded) {

browser(),

GURL("chrome-extension://gbmgkahjioeacddebbnengilkgbkhodg/index.html"));

ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(

- browser()->GetSelectedWebContents()->GetRenderViewHost(), L"",

+ browser()->GetActiveWebContents()->GetRenderViewHost(), L"",

L"window.domAutomationController.send(document.title)",

&result));

EXPECT_EQ(result, "Loaded");

@@ -45,7 +45,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, IconsLoaded) {

browser(),

GURL("chrome-extension://apocjbpjpkghdepdngjlknfpmabcmlao/index.html"));

ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(

- browser()->GetSelectedWebContents()->GetRenderViewHost(), L"",

+ browser()->GetActiveWebContents()->GetRenderViewHost(), L"",

L"window.domAutomationController.send(document.title)",

&result));

EXPECT_EQ(result, "Not Loaded");

@@ -67,7 +67,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, IconsLoadedIncognito) {

Browser* otr_browser = browser::FindTabbedBrowser(

browser()->profile()->GetOffTheRecordProfile(), false);

ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(

- otr_browser->GetSelectedWebContents()->GetRenderViewHost(), L"",

+ otr_browser->GetActiveWebContents()->GetRenderViewHost(), L"",

L"window.domAutomationController.send(document.title)",

&result));

EXPECT_EQ(result, "Loaded");

@@ -78,7 +78,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, IconsLoadedIncognito) {

browser()->profile(),

GURL("chrome-extension://apocjbpjpkghdepdngjlknfpmabcmlao/index.html"));

ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(

- otr_browser->GetSelectedWebContents()->GetRenderViewHost(), L"",

+ otr_browser->GetActiveWebContents()->GetRenderViewHost(), L"",

L"window.domAutomationController.send(document.title)",

&result));

EXPECT_EQ(result, "Not Loaded");

« no previous file with comments | « chrome/browser/extensions/extension_host.cc ('k') | chrome/browser/extensions/extension_incognito_apitest.cc » ('j') | no next file with comments »