chrome/browser/extensions/api/web_request/web_request_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/api/web_request/web_request_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/api/web_navigation/web_navigation_apitest.cc ('k') | chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/web_request/web_request_apitest.cc

diff --git a/chrome/browser/extensions/api/web_request/web_request_apitest.cc b/chrome/browser/extensions/api/web_request/web_request_apitest.cc

index b7122bb2283ca9e1ca0df4b6d9413ce2ecceea37..f9f24d57b6432d54f8604d75205208e0b9d02cd2 100644

--- a/chrome/browser/extensions/api/web_request/web_request_apitest.cc

+++ b/chrome/browser/extensions/api/web_request/web_request_apitest.cc

@@ -10,8 +10,8 @@

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

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

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

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

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

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

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/extensions/features/feature.h"

@@ -114,7 +114,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestNewTab) {

ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_newTab.html"))

<< message_;

- WebContents* tab = chrome::GetActiveWebContents(browser());

+ WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();

content::WaitForLoadStop(tab);

ResultCatcher catcher;

@@ -190,7 +190,7 @@ void ExtensionWebRequestApiTest::RunPermissionTest(

test_server()->GetURL("files/extensions/test_file.html"));

std::string body;

- WebContents* tab = chrome::GetActiveWebContents(browser());

+ WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();

ASSERT_TRUE(content::ExecuteScriptAndExtractString(

tab,

"window.domAutomationController.send(document.body.textContent)",

@@ -211,7 +211,7 @@ void ExtensionWebRequestApiTest::RunPermissionTest(

test_server()->GetURL("files/extensions/test_file.html"));

body.clear();

- WebContents* otr_tab = chrome::GetActiveWebContents(otr_browser);

+ WebContents* otr_tab = otr_browser->tab_strip_model()->GetActiveWebContents();

ASSERT_TRUE(content::ExecuteScriptAndExtractString(

otr_tab,

"window.domAutomationController.send(document.body.textContent)",