chrome/browser/extensions/extension_nacl_browsertest.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_nacl_browsertest.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_install_ui_browsertest.cc ('k') | chrome/browser/extensions/extension_override_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_nacl_browsertest.cc

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

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

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

@@ -16,11 +16,12 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

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

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

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

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

#include "webkit/plugins/webplugininfo.h"

using content::PluginService;

+using content::WebContents;

namespace {

@@ -97,13 +98,13 @@

bool embedded_plugin_created = false;

bool content_handler_plugin_created = false;

- TabContents* tab_contents = browser()->GetSelectedTabContents();

+ WebContents* web_contents = browser()->GetSelectedWebContents();

ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(

- tab_contents->GetRenderViewHost(), L"",

+ web_contents->GetRenderViewHost(), L"",

L"window.domAutomationController.send(EmbeddedPluginCreated());",

&embedded_plugin_created));

ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(

- tab_contents->GetRenderViewHost(), L"",

+ web_contents->GetRenderViewHost(), L"",

L"window.domAutomationController.send(ContentHandlerPluginCreated());",

&content_handler_plugin_created));