Index: content/renderer/browser_plugin/browser_plugin_browsertest.cc |
=================================================================== |
--- content/renderer/browser_plugin/browser_plugin_browsertest.cc (revision 270218) |
+++ content/renderer/browser_plugin/browser_plugin_browsertest.cc (working copy) |
@@ -269,9 +269,9 @@ |
BrowserPluginHostMsg_NavigateGuest::ID); |
ASSERT_TRUE(msg); |
- int instance_id = 0; |
- std::string src; |
- BrowserPluginHostMsg_NavigateGuest::Read(msg, &instance_id, &src); |
+ BrowserPluginHostMsg_NavigateGuest::Param params; |
+ BrowserPluginHostMsg_NavigateGuest::Read(msg, ¶ms); |
+ std::string src = params.b; |
EXPECT_EQ("bar", src); |
std::string src_value = |
ExecuteScriptAndReturnString( |
@@ -328,8 +328,10 @@ |
browser_plugin_manager()->sink().GetUniqueMessageMatching( |
BrowserPluginHostMsg_ResizeGuest::ID); |
ASSERT_TRUE(msg); |
- BrowserPluginHostMsg_ResizeGuest_Params params; |
- BrowserPluginHostMsg_ResizeGuest::Read(msg, &instance_id, ¶ms); |
+ BrowserPluginHostMsg_ResizeGuest::Param param; |
+ BrowserPluginHostMsg_ResizeGuest::Read(msg, ¶m); |
+ instance_id = param.a; |
+ BrowserPluginHostMsg_ResizeGuest_Params params = param.b; |
EXPECT_EQ(641, params.view_rect.width()); |
EXPECT_EQ(480, params.view_rect.height()); |
@@ -576,13 +578,10 @@ |
BrowserPluginHostMsg_SetAutoSize::ID); |
ASSERT_TRUE(auto_size_msg); |
- int instance_id = 0; |
- BrowserPluginHostMsg_AutoSize_Params auto_size_params; |
- BrowserPluginHostMsg_ResizeGuest_Params resize_params; |
- BrowserPluginHostMsg_SetAutoSize::Read(auto_size_msg, |
- &instance_id, |
- &auto_size_params, |
- &resize_params); |
+ BrowserPluginHostMsg_SetAutoSize::Param param; |
+ BrowserPluginHostMsg_SetAutoSize::Read(auto_size_msg, ¶m); |
+ BrowserPluginHostMsg_AutoSize_Params auto_size_params = param.b; |
+ BrowserPluginHostMsg_ResizeGuest_Params resize_params = param.c; |
EXPECT_FALSE(auto_size_params.enable); |
// These value are not populated (as an optimization) if autosize is |
// disabled. |