content/browser/browser_plugin/browser_plugin_host_browsertest.cc - Issue 11956022: Browser Plugin: Allocate Instance IDs in BrowserPluginEmbedder instead of BrowserPluginManager

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: content/browser/browser_plugin/browser_plugin_host_browsertest.cc

Issue 11956022: Browser Plugin: Allocate Instance IDs in BrowserPluginEmbedder instead of BrowserPluginManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Diff against simplified focus 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

« content/browser/browser_plugin/browser_plugin_embedder.cc ('K') | « content/browser/browser_plugin/browser_plugin_embedder.cc ('k') | content/browser/web_contents/web_contents_impl.h » ('j') | content/browser/web_contents/web_contents_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/browser_plugin/browser_plugin_host_browsertest.cc

diff --git a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc

index 5782f586adf52db599877b1187eb5f92fa19b447..fd91c3cc69c98a71adce06fe1f1b2012798806a5 100644

--- a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc

+++ b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc

@@ -712,6 +712,7 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, ReloadEmbedder) {

ExecuteSyncJSFunction(

test_embedder()->web_contents()->GetRenderViewHost(),

StringPrintf("SetSrc('%s');", kHTMLForGuest));

+ test_embedder()->WaitForGuestAdded();

const BrowserPluginEmbedder::ContainerInstanceMap& instance_map =

test_embedder()->guest_web_contents_for_testing();

@@ -720,6 +721,7 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, ReloadEmbedder) {

TestBrowserPluginGuest* new_test_guest =

static_cast<TestBrowserPluginGuest*>(

test_guest_web_contents->GetBrowserPluginGuest());

+ ASSERT_NE(new_test_guest, static_cast<void*>(NULL));

lazyboy 2013/01/17 17:39:25 nit: maybe ASSERT_TRUE(new_tests_guest != NULL); i

Fady Samuel 2013/01/17 18:40:38 Done.

// Wait for the guest to send an UpdateRectMsg, meaning it is ready.

new_test_guest->WaitForUpdateRectMsg();