chrome/browser/extensions/extension_icon_source_apitest.cc - Issue 12066003: Remove TabStripModel wrapper use.

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 12066003: Remove TabStripModel wrapper use. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: gtk Created 7 years, 11 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_dom_clipboard_apitest.cc ('k') | chrome/browser/extensions/extension_keybinding_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

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

index 24b5df037573ca7e2bef46bbdc960dd5f49bfad8..cdf2b50bfdcd323289d9fd86e16929f888ba70dc 100644

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

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

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

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/profiles/profile.h"

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

-#include "chrome/browser/ui/browser_tabstrip.h"

+#include "chrome/browser/ui/tabs/tab_strip_model.h"

#include "chrome/common/chrome_switches.h"

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

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

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

browser(),

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

ASSERT_TRUE(content::ExecuteScriptAndExtractString(

- chrome::GetActiveWebContents(browser()),

+ browser()->tab_strip_model()->GetActiveWebContents(),

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

&result));

EXPECT_EQ(result, "Loaded");

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

browser(),

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

ASSERT_TRUE(content::ExecuteScriptAndExtractString(

- chrome::GetActiveWebContents(browser()),

+ browser()->tab_strip_model()->GetActiveWebContents(),

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

&result));

EXPECT_EQ(result, "Not Loaded");

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

browser()->profile(),

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

ASSERT_TRUE(content::ExecuteScriptAndExtractString(

- chrome::GetActiveWebContents(otr_browser),

+ otr_browser->tab_strip_model()->GetActiveWebContents(),

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

&result));

EXPECT_EQ(result, "Loaded");

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

browser()->profile(),

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

ASSERT_TRUE(content::ExecuteScriptAndExtractString(

- chrome::GetActiveWebContents(otr_browser),

+ otr_browser->tab_strip_model()->GetActiveWebContents(),

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

&result));

EXPECT_EQ(result, "Not Loaded");