chrome/browser/extensions/extension_icon_source_apitest.cc - Issue 9015022: Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've ...

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 9015022: Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 8 years, 12 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

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

Index: chrome/browser/extensions/extension_icon_source_apitest.cc

===================================================================

--- chrome/browser/extensions/extension_icon_source_apitest.cc (revision 116109)

+++ chrome/browser/extensions/extension_icon_source_apitest.cc (working copy)

@@ -10,7 +10,7 @@

#include "chrome/browser/ui/browser_list.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/test/base/ui_test_utils.h"

-#include "content/browser/tab_contents/tab_contents.h"

+#include "content/public/browser/web_contents.h"

#include "googleurl/src/gurl.h"

#include "net/base/mock_host_resolver.h"

@@ -34,7 +34,7 @@

browser(),

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

ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(

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

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

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

&result));

EXPECT_EQ(result, "Loaded");

@@ -45,7 +45,7 @@

browser(),

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

ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(

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

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

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

&result));

EXPECT_EQ(result, "Not Loaded");

@@ -67,7 +67,7 @@

Browser* otr_browser = BrowserList::FindTabbedBrowser(

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

ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(

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

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

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

&result));

EXPECT_EQ(result, "Loaded");

@@ -78,7 +78,7 @@

browser()->profile(),

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

ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString(

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

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

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

&result));

EXPECT_EQ(result, "Not Loaded");