Browser Plugin: New Implementation (Browser Side)

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/path_service.h"
 #include "content/common/browser_plugin_messages.h"
@@ skipping 52 matching lines @@
   v8_str->WriteUtf8(str.get(), length);
   return str.get();
 }
 
 // This test verifies that an initial resize occurs when we instantiate the
 // browser plugin. This test also verifies that the browser plugin is waiting
 // for a BrowserPluginMsg_UpdateRect in response. We issue an UpdateRect, and
 // we observe an UpdateRect_ACK, with the resize_pending_ reset, indiciating
 // that the BrowserPlugin is not waiting for any more UpdateRects to
 // satisfy its resize request.
 TEST_F(BrowserPluginTest, InitialResize) {

[awong, 2012/09/06 19:55:26]

Do we need to test resize being preserved when src=""?

[lazyboy, 2012/09/07 19:33:19]

If I understand this one correctly: since we got an update rect and
resize_pending_ = false happened at the end, this means the size is correct
(640x480).
Fady can comment since he wrote this one.

[Fady Samuel, 2012/09/07 19:37:52]

I think the test being suggested is the following:

1. Create a browser plugin, don't navigate it.
2. Resize the browser plugin.
3. Navigate the browser plugin. Does the guest size itself correctly?

Did i interpret you correctly, Albert?

This is a good test I think but it doesn't belong to this file (renderer side
only tests). It probably belongs to BrowserPluginHostTest

   LoadHTML(GetHTMLForBrowserPluginObject().c_str());
   // Verify that the information based on ResizeGuest is correct, and
   // use its TransportDIB::Id to paint.
   const IPC::Message* msg =
       browser_plugin_manager()->sink().GetUniqueMessageMatching(
           BrowserPluginHostMsg_ResizeGuest::ID);
   ASSERT_TRUE(msg);
   PickleIterator iter = IPC::SyncMessage::GetDataIterator(msg);
   BrowserPluginHostMsg_ResizeGuest::SendParam  resize_params;
   ASSERT_TRUE(IPC::ReadParam(msg, &iter, &resize_params));
@@ skipping 23 matching lines @@
 }
 
 // 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.
   {
     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(
             "document.getElementById('browserplugin').src");
     EXPECT_EQ("bar", src_value);
   }
 }
 
 TEST_F(BrowserPluginTest, ResizeFlowControl) {
   LoadHTML(GetHTMLForBrowserPluginObject().c_str());
@@ skipping 153 matching lines @@
   EXPECT_EQ(kGoogleURL, ExecuteScriptAndReturnString("url"));
 
   ExecuteJavaScript(kRemoveEventListener);
   browser_plugin->DidNavigate(GURL(kGoogleNewsURL));
   // The URL variable should not change because we've removed the event
   // listener.
   EXPECT_EQ(kGoogleURL, ExecuteScriptAndReturnString("url"));
 }
 
 }  // namespace content