Fix AutoResize test and restore origin constants.

chrome/browser/ui/panels/panel_browsertest.cc

Index: chrome/browser/ui/panels/panel_browsertest.cc
diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc
index f7e12e4fe8fac82afd99d9b0edbaa871ef6c0779..9f87768dc8105e34ef36b459256cbf124b8fd063 100644
--- a/chrome/browser/ui/panels/panel_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_browsertest.cc
@@ -834,14 +834,10 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, CreateSettingsMenu) {
       "http://home", "options.html");
 }
 
-#if defined(OS_WIN) || defined(OS_MACOSX)
-#define MAYBE_AutoResize AutoResize
-#else
-#define MAYBE_AutoResize FLAKY_AutoResize
-#endif
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MAYBE_AutoResize) {
+IN_PROC_BROWSER_TEST_F(PanelBrowserTest, AutoResize) {
   PanelManager::GetInstance()->enable_auto_sizing(true);
-  set_testing_work_area(gfx::Rect(0, 0, 1200, 900));

[jennb, 2011/12/02 22:57:34]

This doesn't change the work area. Just changes a member variable in the base
class.  Oops.

[levin, 2011/12/02 23:06:47]

I wonder why this method exists. It appears to have been added here:
http://src.chromium.org/viewvc/chrome?view=rev&revision=109588

but I don't see it being used there.

[jennb, 2011/12/02 23:23:46]

It's used in that test to set the value to 0 so that we don't customize the work
area in that one particular test. Guess that method needs a better name. I would
prefer to rename it in a different patch and keep this one small, if that's ok
with you?

+  PanelManager::GetInstance()->SetWorkAreaForTesting(
+      gfx::Rect(0, 0, 1200, 900));  // bigger space is needed by this test
 
   // Create a test panel with tab contents loaded.
   CreatePanelParams params("PanelTest1", gfx::Rect(), SHOW_AS_ACTIVE);
@@ -859,7 +855,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MAYBE_AutoResize) {
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScript(
       panel->browser()->GetSelectedTabContents()->render_view_host(),
       std::wstring(),
-      L"changeSize(10);"));
+      L"changeSize(50);"));
   enlarge.Wait();
   gfx::Rect bounds_on_grow = panel->GetBounds();
   EXPECT_GT(bounds_on_grow.width(), initial_bounds.width());
@@ -872,7 +868,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MAYBE_AutoResize) {
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScript(
       panel->browser()->GetSelectedTabContents()->render_view_host(),
       std::wstring(),
-      L"changeSize(-5);"));
+      L"changeSize(-30);"));
   shrink.Wait();
   gfx::Rect bounds_on_shrink = panel->GetBounds();
   EXPECT_LT(bounds_on_shrink.width(), bounds_on_grow.width());