Fixes the timeout issue with the pixel tests

chrome/test/gpu/gpu_pixel_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/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
@@ skipping 127 matching lines @@
 
     ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
 
     ui_test_utils::DOMMessageQueue message_queue;
     ui_test_utils::NavigateToURL(browser(), net::FilePathToFileURL(url));
 
     // Wait for notification that page is loaded.
     ASSERT_TRUE(message_queue.WaitForMessage(NULL));
     message_queue.ClearQueue();
 
+    gfx::Rect new_bounds = GetNewTabContainerBounds(tab_container_size);
+
+    std::wostringstream js_call;
+    js_call << "preCallResizeInChromium(";
+    js_call << new_bounds.width() << ", " << new_bounds.height();
+    js_call << ");";
+
     ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(
         browser()->GetSelectedWebContents()->GetRenderViewHost(),
-        L"", L"preCallResizeInChromium();"));
+        L"", js_call.str()));
 
-    ASSERT_TRUE(message_queue.WaitForMessage(NULL));
+    std::string message;
+    ASSERT_TRUE(message_queue.WaitForMessage(&message));
     message_queue.ClearQueue();
-    ResizeTabContainer(tab_container_size);
+    browser()->window()->SetBounds(new_bounds);
 
     // Wait for message from test page indicating the rendering is done.
-    std::string message;
     while (message.compare("\"resized\"")) {
       ASSERT_TRUE(message_queue.WaitForMessage(&message));
       message_queue.ClearQueue();
     }
 
     bool ignore_bottom_corners = false;
 #if defined(OS_MACOSX)
     // On Mac Lion, bottom corners have shadows with random pixels.
     ignore_bottom_corners = true;
 #endif
@@ skipping 155 matching lines @@
         LOG(ERROR) << "Can't save generated diff image to: "
                    << img_diff_path.value();
       } else {
         LOG(INFO) << "Saved difference image to: "
                   << img_diff_path.value();
       }
     }
     return rt;
   }
 
-  // Resizes the browser window so that the tab's contents are at a given size.
-  void ResizeTabContainer(const gfx::Size& desired_size) {
+  // Returns a gfx::Rect representing the bounds that the browser window should
+  // have if the tab contents have the desired size.
+  gfx::Rect GetNewTabContainerBounds(const gfx::Size& desired_size) {
     gfx::Rect container_rect;
     browser()->GetSelectedWebContents()->GetContainerBounds(&container_rect);
     // Size cannot be negative, so use a point.
     gfx::Point correction(
         desired_size.width() - container_rect.size().width(),
         desired_size.height() - container_rect.size().height());
 
     gfx::Rect window_rect = browser()->window()->GetRestoredBounds();
     gfx::Size new_size = window_rect.size();
     new_size.Enlarge(correction.x(), correction.y());
     window_rect.set_size(new_size);
-    browser()->window()->SetBounds(window_rect);
+    return window_rect;
   }
 
   // Take snapshot of the current tab, encode it as PNG, and save to a SkBitmap.
   bool TabSnapShotToImage(SkBitmap* bitmap) {
     CHECK(bitmap);
     std::vector<unsigned char> png;
 
     gfx::Rect root_bounds = browser()->window()->GetBounds();
     gfx::Rect tab_contents_bounds;
     browser()->GetSelectedWebContents()->GetContainerBounds(
@@ skipping 126 matching lines @@
 IN_PROC_BROWSER_TEST_F(Canvas2DPixelTestSD, MAYBE_Canvas2DRedBoxSD) {
   // If test baseline needs to be updated after a given revision, update the
   // following number. If no revision requirement, then 0.
   const int64 ref_img_revision_update = 123489;
 
   gfx::Size container_size(400, 300);
   FilePath url =
       test_data_dir().AppendASCII("pixel_canvas2d.html");
   RunPixelTest(container_size, url, ref_img_revision_update);
 }