Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1381)

Unified Diff: content/renderer/browser_plugin/browser_plugin_browsertest.cc

Issue 10868012: Browser Plugin: New Implementation (Browser Side) (Closed) Base URL: http://git.chromium.org/chromium/src.git@master-trial-obrowser
Patch Set: Fixed tests. Also fixed a case where UpdateRect was being sent from bp renderer before NavigateGues… Created 8 years, 4 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
Index: content/renderer/browser_plugin/browser_plugin_browsertest.cc
diff --git a/content/renderer/browser_plugin/browser_plugin_browsertest.cc b/content/renderer/browser_plugin/browser_plugin_browsertest.cc
index 0e1fa0e464bf06198b326504f65d1fdcb0d13946..00dfa23b8fd5172cde5d0f8d9ec8b6ed820f1c53 100644
--- a/content/renderer/browser_plugin/browser_plugin_browsertest.cc
+++ b/content/renderer/browser_plugin/browser_plugin_browsertest.cc
@@ -114,39 +114,43 @@ TEST_F(BrowserPluginTest, SrcAttribute) {
{
const IPC::Message* msg =
browser_plugin_manager()->sink().GetUniqueMessageMatching(
- BrowserPluginHostMsg_NavigateOrCreateGuest::ID);
+ BrowserPluginHostMsg_NavigateGuest::ID);
ASSERT_TRUE(msg);
int instance_id;
long long frame_id;
std::string src;
- BrowserPluginHostMsg_NavigateOrCreateGuest::Read(
+ gfx::Size size;
+ BrowserPluginHostMsg_NavigateGuest::Read(
msg,
&instance_id,
&frame_id,
- &src);
+ &src,
+ &size);
EXPECT_EQ("foo", src);
}
browser_plugin_manager()->sink().ClearMessages();
// Navigate to bar and observe the associated
- // BrowserPluginHostMsg_NavigateOrCreateGuest message.
+ // BrowserPluginHostMsg_NavigateGuest message.
// Verify that the src attribute is updated as well.
ExecuteJavaScript("document.getElementById('browserplugin').src = 'bar'");
{
const IPC::Message* msg =
browser_plugin_manager()->sink().GetUniqueMessageMatching(
- BrowserPluginHostMsg_NavigateOrCreateGuest::ID);
+ BrowserPluginHostMsg_NavigateGuest::ID);
ASSERT_TRUE(msg);
int instance_id;
long long frame_id;
std::string src;
- BrowserPluginHostMsg_NavigateOrCreateGuest::Read(
+ gfx::Size size;
+ BrowserPluginHostMsg_NavigateGuest::Read(
msg,
&instance_id,
&frame_id,
- &src);
+ &src,
+ &size);
EXPECT_EQ("bar", src);
std::string src_value =
ExecuteScriptAndReturnString(

Powered by Google App Engine
This is Rietveld 408576698