chrome/browser/extensions/api/webstore_private/webstore_private_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/webstore_private/webstore_private_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_request/web_request_apitest.cc ('k') | chrome/browser/extensions/chrome_app_api_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc

diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc

index 2c23eef70edeab415e18443fc123b6e38e9b1e80..c60af7f08799c943406ec419cef2a984196b09ba 100644

--- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc

+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc

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

#include "chrome/browser/extensions/webstore_installer.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_notification_types.h"

#include "chrome/common/chrome_switches.h"

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

@@ -255,7 +255,8 @@ class ExtensionWebstoreGetWebGLStatusTest : public InProcessBrowserTest {

// Test cases for webstore origin frame blocking.

IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest,

FrameWebstorePageBlocked) {

- content::WebContents* contents = chrome::GetActiveWebContents(browser());

+ content::WebContents* contents =

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

string16 expected_title = UTF8ToUTF16("PASS: about:blank");

string16 failure_title = UTF8ToUTF16("FAIL");

content::TitleWatcher watcher(contents, expected_title);

@@ -269,7 +270,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest,