Browser Plugin: Simplify BrowserPluginGuestHelper

content/renderer/browser_plugin/browser_plugin_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/browser_plugin/browser_plugin_browsertest.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/singleton.h"
 #include "base/path_service.h"
@@ skipping 140 matching lines @@
   BrowserPluginMsg_UpdateRect_Params update_rect_params;
   update_rect_params.damage_buffer_identifier =
 #if defined(OS_MACOSX)
         browser_plugin->pending_damage_buffer_->id();
 #else
         browser_plugin->pending_damage_buffer_->handle();
 #endif
   update_rect_params.view_size = gfx::Size(640, 480);
   update_rect_params.scale_factor = 1.0f;
   update_rect_params.is_resize_ack = true;
-  BrowserPluginMsg_UpdateRect msg(0, instance_id, 0, update_rect_params);
+  BrowserPluginMsg_UpdateRect msg(0, instance_id, update_rect_params);
   browser_plugin->OnMessageReceived(msg);
   EXPECT_FALSE(browser_plugin->pending_damage_buffer_);
 }
 
 // Verify that the src attribute on the browser plugin works as expected.
 TEST_F(BrowserPluginTest, SrcAttribute) {
   LoadHTML(GetHTMLForBrowserPluginObject().c_str());
   // Verify that we're reporting the correct URL to navigate to based on the
   // src attribute.
   {
@@ skipping 70 matching lines @@
     update_rect_params.is_resize_ack = true;
     // By sending the damage buffer handle back to BrowserPlugin on UpdateRect,
     // then the BrowserPlugin knows that the browser process has received and
     // has begun to use the pending_damage_buffer.
     update_rect_params.damage_buffer_identifier =
 #if defined(OS_MACOSX)
         browser_plugin->pending_damage_buffer_->id();
 #else
         browser_plugin->pending_damage_buffer_->handle();
 #endif
-    BrowserPluginMsg_UpdateRect msg(0, instance_id, 0, update_rect_params);
+    BrowserPluginMsg_UpdateRect msg(0, instance_id, update_rect_params);
     browser_plugin->OnMessageReceived(msg);
     EXPECT_EQ(NULL, browser_plugin->pending_damage_buffer_);
   }
 
   browser_plugin_manager()->sink().ClearMessages();
 
   // Resize the browser plugin three times.
   ExecuteJavaScript("document.getElementById('browserplugin').width = '641px'");
   ProcessPendingMessages();
   ExecuteJavaScript("document.getElementById('browserplugin').width = '642px'");
@@ skipping 22 matching lines @@
     BrowserPluginMsg_UpdateRect_Params update_rect_params;
     update_rect_params.view_size = gfx::Size(641, 480);
     update_rect_params.scale_factor = 1.0f;
     update_rect_params.is_resize_ack = true;
     update_rect_params.damage_buffer_identifier =
 #if defined(OS_MACOSX)
         browser_plugin->pending_damage_buffer_->id();
 #else
         browser_plugin->pending_damage_buffer_->handle();
 #endif
-    BrowserPluginMsg_UpdateRect msg(0, instance_id, 0, update_rect_params);
+    BrowserPluginMsg_UpdateRect msg(0, instance_id, update_rect_params);
     browser_plugin->OnMessageReceived(msg);
     // This tells us that the BrowserPlugin is still expecting another
     // UpdateRect with the most recent size.
     EXPECT_TRUE(browser_plugin->pending_damage_buffer_);
   }
   // Send the BrowserPlugin another UpdateRect, but this time with a size
   // that matches the size of the container.
   {
     BrowserPluginMsg_UpdateRect_Params update_rect_params;
     update_rect_params.view_size = gfx::Size(643, 480);
     update_rect_params.scale_factor = 1.0f;
     update_rect_params.is_resize_ack = true;
     update_rect_params.damage_buffer_identifier =
 #if defined(OS_MACOSX)
         browser_plugin->pending_damage_buffer_->id();
 #else
         browser_plugin->pending_damage_buffer_->handle();
 #endif
-    BrowserPluginMsg_UpdateRect msg(0, instance_id, 0, update_rect_params);
+    BrowserPluginMsg_UpdateRect msg(0, instance_id, update_rect_params);
     browser_plugin->OnMessageReceived(msg);
     // The BrowserPlugin has finally received an UpdateRect that satisifes
     // its current size, and so it is happy.
     EXPECT_FALSE(browser_plugin->pending_damage_buffer_);
   }
 }
 
 TEST_F(BrowserPluginTest, GuestCrash) {
   LoadHTML(GetHTMLForBrowserPluginObject().c_str());
 
@@ skipping 502 matching lines @@
   BrowserPluginMsg_UpdateRect_Params update_rect_params;
   update_rect_params.damage_buffer_identifier =
 #if defined(OS_MACOSX)
         browser_plugin->pending_damage_buffer_->id();
 #else
         browser_plugin->pending_damage_buffer_->handle();
 #endif
   update_rect_params.view_size = gfx::Size(1337, 1338);
   update_rect_params.scale_factor = 1.0f;
   update_rect_params.is_resize_ack = true;
-  BrowserPluginMsg_UpdateRect msg(0, instance_id, 0, update_rect_params);
+  BrowserPluginMsg_UpdateRect msg(0, instance_id, update_rect_params);
   browser_plugin->OnMessageReceived(msg);
 
   // Verify that the autosize state has been updated.
   {
     const IPC::Message* auto_size_msg =
     browser_plugin_manager()->sink().GetUniqueMessageMatching(
         BrowserPluginHostMsg_UpdateRect_ACK::ID);
     ASSERT_TRUE(auto_size_msg);
 
     int instance_id = 0;
-    int message_id = 0;
     BrowserPluginHostMsg_AutoSize_Params auto_size_params;
     BrowserPluginHostMsg_ResizeGuest_Params resize_params;
     BrowserPluginHostMsg_UpdateRect_ACK::Read(auto_size_msg,
                                               &instance_id,
-                                              &message_id,
                                               &auto_size_params,
                                               &resize_params);
     EXPECT_FALSE(auto_size_params.enable);
     EXPECT_EQ(42, auto_size_params.min_size.width());
     EXPECT_EQ(43, auto_size_params.min_size.height());
     EXPECT_EQ(1337, auto_size_params.max_size.width());
     EXPECT_EQ(1338, auto_size_params.max_size.height());
   }
 }
 
 }  // namespace content