[BrowserTag] Send dib info with NavigateGuest message,

content/browser/browser_plugin/browser_plugin_host_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 "base/memory/singleton.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
 #include "content/browser/browser_plugin/browser_plugin_host_factory.h"
@@ skipping 285 matching lines @@
   ASSERT_TRUE(test_server()->Start());
   GURL test_url(test_server()->GetURL(
       "files/browser_plugin_embedder.html"));
   NavigateToURL(shell(), test_url);
 
   WebContentsImpl* embedder_web_contents = static_cast<WebContentsImpl*>(
       shell()->web_contents());
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
       embedder_web_contents->GetRenderViewHost());
 
-  int nxt_width = 100;
-  int nxt_height = 200;
+  const gfx::Size nxt_size = gfx::Size(100, 200);
   rvh->ExecuteJavascriptAndGetValue(string16(), ASCIIToUTF16(
-      StringPrintf("SetSize(%d, %d);", nxt_width, nxt_height)));
+      StringPrintf("SetSize(%d, %d);", nxt_size.width(), nxt_size.height())));
 
   rvh->ExecuteJavascriptAndGetValue(string16(), ASCIIToUTF16(
       StringPrintf("SetSrc('%s');", kHTMLForGuest)));
 
   // Wait to make sure embedder is created/attached to WebContents.
   TestBrowserPluginHostFactory::GetInstance()->WaitForEmbedderCreation();
 
   TestBrowserPluginEmbedder* test_embedder =
       static_cast<TestBrowserPluginEmbedder*>(
           embedder_web_contents->GetBrowserPluginEmbedder());
   ASSERT_TRUE(test_embedder);
   test_embedder->WaitForGuestAdded();
 
   // Verify that we have exactly one guest.
   const BrowserPluginEmbedder::ContainerInstanceMap& instance_map =
       test_embedder->guest_web_contents_for_testing();
   EXPECT_EQ(1u, instance_map.size());
 
   WebContentsImpl* test_guest_web_contents = static_cast<WebContentsImpl*>(
       instance_map.begin()->second);
   TestBrowserPluginGuest* test_guest = static_cast<TestBrowserPluginGuest*>(
       test_guest_web_contents->GetBrowserPluginGuest());
 
-
-  // Wait for the guest to send an UpdateRectMsg, the dimensions should be
-  // 100 x 200.
-  test_guest->WaitForUpdateRectMsgWithSize(nxt_width, nxt_height);
+  // Wait for the guest to receive a damage buffer of size 100x200.
+  // This means the guest will be painted properly at that size.
+  test_guest->WaitForDamageBufferWithSize(nxt_size);
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, AdvanceFocus) {
   ASSERT_TRUE(test_server()->Start());
   GURL test_url(test_server()->GetURL(
       "files/browser_plugin_focus.html"));
   NavigateToURL(shell(), test_url);
 
   WebContentsImpl* embedder_web_contents = static_cast<WebContentsImpl*>(
       shell()->web_contents());
@@ skipping 445 matching lines @@
 
     rvh->ExecuteJavascriptAndGetValue(string16(), ASCIIToUTF16("Go(-2);"));
 
     string16 actual_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, actual_title);
   }
 }
 
 
 }  // namespace content