Browser Plugin: Reduce code repetition in BrowserPluginManager.

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 138 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;
-  browser_plugin->UpdateRect(0, update_rect_params);
+  browser_plugin->ReceiveMessage(
+      new BrowserPluginMsg_UpdateRect(0, instance_id, 0, update_rect_params));

[sadrul, 2012/12/14 16:08:39]

Are these messages leaking? Can you just create the messages on the stack?

[sadrul, 2012/12/14 16:08:39]

I see that the messages aren't leaking because the mock plugin deletes these.
But if these messages can be on the stack, that would probably be better.

[Fady Samuel, 2012/12/14 17:05:54]

Done.

   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.
   {
     // Ensure we get a CreateGuest on the initial navigation.
@@ skipping 69 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
-    browser_plugin->UpdateRect(0, update_rect_params);
+    browser_plugin->ReceiveMessage(
+        new BrowserPluginMsg_UpdateRect(0, instance_id, 0, update_rect_params));
     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'");
   ProcessPendingMessages();
@@ skipping 21 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
-    browser_plugin->UpdateRect(0, update_rect_params);
+    browser_plugin->ReceiveMessage(
+        new BrowserPluginMsg_UpdateRect(0, instance_id, 0, update_rect_params));
     // 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
-    browser_plugin->UpdateRect(0, update_rect_params);
+    browser_plugin->ReceiveMessage(
+        new BrowserPluginMsg_UpdateRect(0, instance_id, 0, update_rect_params));
     // 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());
 
   // Grab the BrowserPlugin's instance ID from its resize message.
@@ skipping 22 matching lines @@
     "var msg;"
     "function exitListener(e) {"
     "  msg = JSON.parse(e.detail).reason;"
     "}"
     "document.getElementById('browserplugin')."
     "    addEventListener('-internal-exit', exitListener);";
 
   ExecuteJavaScript(kAddEventListener);
 
   // Pretend that the guest has terminated normally.
-  browser_plugin->GuestGone(0, base::TERMINATION_STATUS_NORMAL_TERMINATION);
+  browser_plugin->ReceiveMessage(
+      new BrowserPluginMsg_GuestGone(
+          0, 0, 0, base::TERMINATION_STATUS_NORMAL_TERMINATION));
 
   // Verify that our event listener has fired.
   EXPECT_EQ("normal", ExecuteScriptAndReturnString("msg"));
 
   // Pretend that the guest has crashed.
-  browser_plugin->GuestGone(0, base::TERMINATION_STATUS_PROCESS_CRASHED);
+  browser_plugin->ReceiveMessage(
+      new BrowserPluginMsg_GuestGone(
+          0, 0, 0, base::TERMINATION_STATUS_PROCESS_CRASHED));
 
   // Verify that our event listener has fired.
   EXPECT_EQ("crashed", ExecuteScriptAndReturnString("msg"));
 
   // Send an event and verify that events are no longer deported.
   browser_plugin->handleInputEvent(WebKit::WebMouseEvent(),
                                    cursor_info);
   EXPECT_FALSE(browser_plugin_manager()->sink().GetUniqueMessageMatching(
       BrowserPluginHostMsg_HandleInputEvent::ID));
 }
@@ skipping 41 matching lines @@
   MockBrowserPlugin* browser_plugin =
       static_cast<MockBrowserPlugin*>(
           browser_plugin_manager()->GetBrowserPlugin(instance_id));
   ASSERT_TRUE(browser_plugin);
 
   {
     BrowserPluginMsg_LoadCommit_Params navigate_params;
     navigate_params.is_top_level = true;
     navigate_params.url = GURL(kGoogleURL);
     navigate_params.process_id = 1337;
-    browser_plugin->LoadCommit(navigate_params);
+    browser_plugin->ReceiveMessage(
+        new BrowserPluginMsg_LoadCommit(0, instance_id, navigate_params));
     EXPECT_EQ(kGoogleURL, ExecuteScriptAndReturnString("url"));
     EXPECT_EQ(kGoogleURL, ExecuteScriptAndReturnString(kGetSrc));
     EXPECT_EQ(1337, ExecuteScriptAndReturnInt(kGetProcessID));
   }
   ExecuteJavaScript(kRemoveEventListener);
   {
     BrowserPluginMsg_LoadCommit_Params navigate_params;
     navigate_params.is_top_level = false;
     navigate_params.url = GURL(kGoogleNewsURL);
     navigate_params.process_id = 42;
-    browser_plugin->LoadCommit(navigate_params);
+    browser_plugin->ReceiveMessage(
+        new BrowserPluginMsg_LoadCommit(0, instance_id, navigate_params));
     // The URL variable should not change because we've removed the event
     // listener.
     EXPECT_EQ(kGoogleURL, ExecuteScriptAndReturnString("url"));
     // The src attribute should not change if this is a top-level navigation.
     EXPECT_EQ(kGoogleURL, ExecuteScriptAndReturnString(kGetSrc));
     EXPECT_EQ(42, ExecuteScriptAndReturnInt(kGetProcessID));
   }
 }
 
 TEST_F(BrowserPluginTest, StopMethod) {
@@ skipping 197 matching lines @@
 
   MockBrowserPlugin* browser_plugin =
       static_cast<MockBrowserPlugin*>(
           browser_plugin_manager()->GetBrowserPlugin(instance_id));
   ASSERT_TRUE(browser_plugin);
 
   {
     BrowserPluginMsg_LoadCommit_Params navigate_params;
     navigate_params.url = GURL(kGoogleURL);
     navigate_params.process_id = 1337;
-    browser_plugin->LoadCommit(navigate_params);
+    browser_plugin->ReceiveMessage(
+        new BrowserPluginMsg_LoadCommit(0, instance_id, navigate_params));
     EXPECT_EQ(kGoogleURL, ExecuteScriptAndReturnString("url"));
     EXPECT_EQ(1337, ExecuteScriptAndReturnInt(kGetProcessID));
   }
   {
     BrowserPluginMsg_LoadCommit_Params navigate_params;
     navigate_params.url = GURL(kGoogleNewsURL);
     navigate_params.process_id = 42;
-    browser_plugin->LoadCommit(navigate_params);
+    browser_plugin->ReceiveMessage(
+        new BrowserPluginMsg_LoadCommit(0, instance_id, navigate_params));
     // The URL variable should not change because we've removed the event
     // listener.
     EXPECT_EQ(kGoogleURL, ExecuteScriptAndReturnString("url"));
     EXPECT_EQ(42, ExecuteScriptAndReturnInt(kGetProcessID));
   }
 }
 
 // This test verifies that multiple event listeners fire that are registered
 // on a single event type.
 TEST_F(BrowserPluginTest, MultipleEventListeners) {
@@ skipping 26 matching lines @@
 
   MockBrowserPlugin* browser_plugin =
       static_cast<MockBrowserPlugin*>(
           browser_plugin_manager()->GetBrowserPlugin(instance_id));
   ASSERT_TRUE(browser_plugin);
 
   {
     BrowserPluginMsg_LoadCommit_Params navigate_params;
     navigate_params.url = GURL(kGoogleURL);
     navigate_params.process_id = 1337;
-    browser_plugin->LoadCommit(navigate_params);
+    browser_plugin->ReceiveMessage(
+        new BrowserPluginMsg_LoadCommit(0, instance_id, navigate_params));
     EXPECT_EQ(2, ExecuteScriptAndReturnInt("count"));
     EXPECT_EQ(1337, ExecuteScriptAndReturnInt(kGetProcessID));
   }
 }
 
 TEST_F(BrowserPluginTest, RemoveBrowserPluginOnExit) {
   LoadHTML(GetHTMLForBrowserPluginObject().c_str());
 
   // Grab the BrowserPlugin's instance ID from its resize message.
   const IPC::Message* msg =
@@ skipping 15 matching lines @@
     "    var bp = document.getElementById('browserplugin');"
     "    bp.parentNode.removeChild(bp);"
     "  }"
     "}"
     "document.getElementById('browserplugin')."
     "    addEventListener('-internal-exit', exitListener);";
 
   ExecuteJavaScript(kAddEventListener);
 
   // Pretend that the guest has crashed.
-  browser_plugin->GuestGone(0, base::TERMINATION_STATUS_PROCESS_WAS_KILLED);
+  browser_plugin->ReceiveMessage(
+      new BrowserPluginMsg_GuestGone(
+          0, instance_id, 0, base::TERMINATION_STATUS_PROCESS_WAS_KILLED));
 
   ProcessPendingMessages();
 
   EXPECT_EQ(NULL, browser_plugin_manager()->GetBrowserPlugin(instance_id));
 }
 
 TEST_F(BrowserPluginTest, AutoSizeAttributes) {
   std::string html = StringPrintf(kHTMLForSourcelessPluginObject,
                                   content::kBrowserPluginMimeType);
   LoadHTML(html.c_str());
@@ skipping 52 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;
-  browser_plugin->UpdateRect(0, update_rect_params);
+  browser_plugin->ReceiveMessage(
+      new BrowserPluginMsg_UpdateRect(0, instance_id, 0, update_rect_params));
 
   // 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 = -1;
     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