Change panels to be able to turn off autoresize.

chrome/browser/ui/panels/panel_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/bind.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/net/url_request_mock_util.h"
@@ skipping 782 matching lines @@
 IN_PROC_BROWSER_TEST_F(PanelBrowserTest, CreateSettingsMenu) {
   TestCreateSettingsMenuForExtension(
       FILE_PATH_LITERAL("extension1"), Extension::EXTERNAL_POLICY_DOWNLOAD,
       "", "");
   TestCreateSettingsMenuForExtension(
       FILE_PATH_LITERAL("extension2"), Extension::INVALID,
       "http://home", "options.html");
 }
 
 // Flaky: http://crbug.com/105445
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DISABLED_AutoResize) {
-  PanelManager::GetInstance()->enable_auto_sizing(true);
-  PanelManager::GetInstance()->SetWorkAreaForTesting(
-      gfx::Rect(0, 0, 1200, 900));  // bigger space is needed by this test
+IN_PROC_BROWSER_TEST_F(PanelBrowserTest, AutoResize) {

[jennb, 2012/02/29 19:46:00]

Remember to leave this DISABLED before commit as it will probably still be
flaky.

[levin, 2012/02/29 23:48:28]

Done. Thanks!

+  PanelManager* panel_manager = PanelManager::GetInstance();
+  panel_manager->enable_auto_sizing(true);
+  // Bigger space is needed by this test.
+  panel_manager->SetWorkAreaForTesting(gfx::Rect(0, 0, 1200, 900));
 
   // Create a test panel with tab contents loaded.
   CreatePanelParams params("PanelTest1", gfx::Rect(), SHOW_AS_ACTIVE);
   GURL url(ui_test_utils::GetTestUrl(
       FilePath(kTestDir),
       FilePath(FILE_PATH_LITERAL("update-preferred-size.html"))));
   params.url = url;
   Panel* panel = CreatePanelWithParams(params);
 
   // Expand the test page.
@@ skipping 17 matching lines @@
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScript(
       panel->browser()->GetSelectedWebContents()->GetRenderViewHost(),
       std::wstring(),
       L"changeSize(-30);"));
   shrink.Wait();
   gfx::Rect bounds_on_shrink = panel->GetBounds();
   EXPECT_LT(bounds_on_shrink.width(), bounds_on_grow.width());
   EXPECT_GT(bounds_on_shrink.width(), initial_bounds.width());
   EXPECT_EQ(bounds_on_shrink.height(), initial_bounds.height());
 
+  // Verify resizing turns off auto-resizing and that it works.
+  gfx::Rect previous_bounds = panel->GetBounds();
+  // These should be identical because the panel is expanded.
+  EXPECT_EQ(previous_bounds.size(), panel->GetRestoredBounds().size());
+  gfx::Size new_size(previous_bounds.size());
+  new_size.Enlarge(5, 5);
+  panel_manager->ResizePanel(panel, new_size);
+  EXPECT_FALSE(panel->auto_resizable());
+  EXPECT_EQ(new_size, panel->GetBounds().size());
+  EXPECT_EQ(new_size, panel->GetRestoredBounds().size());
+
+  // Turn back on auto-resize and verify that it works.
+  ui_test_utils::WindowedNotificationObserver auto_resize_enabled(
+      chrome::NOTIFICATION_PANEL_BOUNDS_ANIMATIONS_FINISHED,
+      content::Source<Panel>(panel));
+  panel->SetAutoResizable(true);
+  auto_resize_enabled.Wait();
+  gfx::Rect bounds_auto_resize_enabled = panel->GetBounds();
+  EXPECT_EQ(bounds_on_shrink.width(), bounds_auto_resize_enabled.width());
+  EXPECT_EQ(bounds_on_shrink.height(), bounds_auto_resize_enabled.height());
+
   panel->Close();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelBrowserTest, ResizePanel) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   panel_manager->enable_auto_sizing(true);
 
   Panel* panel = CreatePanel("TestPanel");
   EXPECT_TRUE(panel->auto_resizable());
   EXPECT_EQ(Panel::EXPANDED, panel->expansion_state());
 
-  // Verify resizing an auto-resizable panel is a no-op for now.
-  // http://crbug.com/109343
+  // Verify resizing turns off auto-resizing and that it works.
   gfx::Rect original_bounds = panel->GetBounds();
-  gfx::Rect original_restored_bounds = panel->GetRestoredBounds();
-  gfx::Size new_size(150, 200);
-  panel_manager->ResizePanel(panel, new_size);
-  EXPECT_EQ(original_bounds, panel->GetBounds());
-  EXPECT_EQ(original_restored_bounds, panel->GetRestoredBounds());
-
-  // Verify resizing adjusts bounds correctly when not auto-resizable.
-  panel->SetAutoResizable(false);
+  // These should be identical because the panel is expanded.
+  EXPECT_EQ(original_bounds.size(), panel->GetRestoredBounds().size());
+  gfx::Size new_size(original_bounds.size());
+  new_size.Enlarge(5, 5);
   panel_manager->ResizePanel(panel, new_size);
   EXPECT_FALSE(panel->auto_resizable());
   EXPECT_EQ(new_size, panel->GetBounds().size());
   EXPECT_EQ(new_size, panel->GetRestoredBounds().size());
 
   // Verify current height unaffected when panel is not expanded.
   panel->SetExpansionState(Panel::MINIMIZED);
   int original_height = panel->GetBounds().height();
   new_size.Enlarge(5, 5);
   panel_manager->ResizePanel(panel, new_size);
@@ skipping 1121 matching lines @@
   // position when tall panel brings up its titlebar.
   CloseWindowAndWait(panel1->browser());
   EXPECT_EQ(balloon_bottom_after_tall_panel_titlebar_up,
             GetBalloonBottomPosition(balloon));
 
   // Closing the remaining tall panel should move the notification balloon back
   // to its original position.
   CloseWindowAndWait(panel2->browser());
   EXPECT_EQ(original_balloon_bottom, GetBalloonBottomPosition(balloon));
 }