Revert 141690 - Modify old Panel test files and include them in .gyp.

chrome/browser/ui/panels/old_panel_resize_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 "chrome/browser/ui/panels/old_base_panel_browser_test.h"
+#include "chrome/browser/ui/panels/base_panel_browser_test.h"
 #include "chrome/browser/ui/panels/detached_panel_strip.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/panel_resize_controller.h"
 
-class OldPanelResizeBrowserTest : public OldBasePanelBrowserTest {
+class PanelResizeBrowserTest : public BasePanelBrowserTest {
  public:
-  OldPanelResizeBrowserTest() : OldBasePanelBrowserTest() {
+  PanelResizeBrowserTest() : BasePanelBrowserTest() {
   }
 
-  virtual ~OldPanelResizeBrowserTest() {
+  virtual ~PanelResizeBrowserTest() {
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
-    OldBasePanelBrowserTest::SetUpOnMainThread();
+    BasePanelBrowserTest::SetUpOnMainThread();
 
     // All the tests here assume using mocked 800x600 screen area for the
     // primary monitor. Do the check now.
     gfx::Rect primary_screen_area = PanelManager::GetInstance()->
         display_settings_provider()->GetPrimaryScreenArea();
     DCHECK(primary_screen_area.width() == 800);
     DCHECK(primary_screen_area.height() == 600);
   }
 };
 
-IN_PROC_BROWSER_TEST_F(OldPanelResizeBrowserTest, DockedPanelResizability) {
+IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, DockedPanelResizability) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   Panel* panel = CreatePanel("Panel");
 
   EXPECT_EQ(panel::RESIZABLE_ALL_SIDES_EXCEPT_BOTTOM,
             panel->CanResizeByMouse());
 
   gfx::Rect bounds = panel->GetBounds();
 
   // Try resizing by the top left corner.
   gfx::Point mouse_location = bounds.origin();
@@ skipping 98 matching lines @@
   mouse_location.Offset(20, 10);
   panel_manager->ResizeByMouse(mouse_location);
   EXPECT_EQ(bounds, panel->GetBounds());
 
   panel_manager->EndResizingByMouse(false);
   EXPECT_EQ(bounds, panel->GetBounds());
 
   panel->Close();
 }
 
-IN_PROC_BROWSER_TEST_F(OldPanelResizeBrowserTest, ResizeDetachedPanel) {
+IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, ResizeDetachedPanel) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   Panel* panel = CreateDetachedPanel("Panel", gfx::Rect(300, 200, 150, 100));
 
   EXPECT_EQ(panel::RESIZABLE_ALL_SIDES, panel->CanResizeByMouse());
 
   gfx::Rect bounds = panel->GetBounds();
 
   // Try resizing by the right side; verify resize will change width only.
   gfx::Point mouse_location = bounds.origin().Add(
       gfx::Point(bounds.width() - 1, 30));
@@ skipping 46 matching lines @@
   bounds.set_size(gfx::Size(bounds.width() + 20, bounds.height() + 10));
   bounds.Offset(-20, -10);
   EXPECT_EQ(bounds, panel->GetBounds());
 
   panel_manager->EndResizingByMouse(false);
   EXPECT_EQ(bounds, panel->GetBounds());
 
   PanelManager::GetInstance()->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(OldPanelResizeBrowserTest,
-                       ResizeDetachedPanelToClampSize) {
+IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, ResizeDetachedPanelToClampSize) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   Panel* panel = CreateDetachedPanel("Panel", gfx::Rect(300, 200, 150, 100));
 
   EXPECT_EQ(panel::RESIZABLE_ALL_SIDES, panel->CanResizeByMouse());
 
   gfx::Rect bounds = panel->GetBounds();
 
   // Make sure the panel does not resize smaller than its min size.
   gfx::Point mouse_location = bounds.origin().Add(
       gfx::Point(30, bounds.height() - 2));
@@ skipping 24 matching lines @@
   bounds.set_size(gfx::Size(bounds.width() + delta_x,
                             bounds.height() + delta_y));
   EXPECT_EQ(bounds, panel->GetBounds());
 
   panel_manager->EndResizingByMouse(false);
   EXPECT_EQ(bounds, panel->GetBounds());
 
   PanelManager::GetInstance()->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(OldPanelResizeBrowserTest,
-                       CloseDetachedPanelOnResize) {
+IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, CloseDetachedPanelOnResize) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   PanelResizeController* resize_controller = panel_manager->resize_controller();
   DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
 
   // Create 3 detached panels.
   Panel* panel1 = CreateDetachedPanel("1", gfx::Rect(100, 200, 100, 100));
   Panel* panel2 = CreateDetachedPanel("2", gfx::Rect(200, 210, 110, 110));
   Panel* panel3 = CreateDetachedPanel("3", gfx::Rect(300, 220, 120, 120));
   ASSERT_EQ(3, detached_strip->num_panels());
 
@@ skipping 41 matching lines @@
   // resizing mode by now.
   EXPECT_FALSE(resize_controller->IsResizing());
 
   panel_manager->EndResizingByMouse(false);
   EXPECT_FALSE(resize_controller->IsResizing());
   EXPECT_EQ(panel1_bounds, panel1->GetBounds());
 
   panel_manager->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(OldPanelResizeBrowserTest, ResizeAndCancel) {
+IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, ResizeAndCancel) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   Panel* panel = CreateDetachedPanel("Panel", gfx::Rect(300, 200, 150, 100));
   PanelResizeController* resize_controller = panel_manager->resize_controller();
 
   EXPECT_EQ(panel::RESIZABLE_ALL_SIDES, panel->CanResizeByMouse());
 
   gfx::Rect original_bounds = panel->GetBounds();
 
   // Resizing the panel, then cancelling should return it to the original state.
   // Try resizing by the top right side.
@@ skipping 25 matching lines @@
   bounds.Offset(-10, 0);
   EXPECT_EQ(bounds, panel->GetBounds());
 
   panel_manager->EndResizingByMouse(true);
   EXPECT_EQ(original_bounds, panel->GetBounds());
   EXPECT_FALSE(resize_controller->IsResizing());
 
   panel_manager->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(OldPanelResizeBrowserTest, ResizeDetachedPanelToTop) {
+IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, ResizeDetachedPanelToTop) {
   // Setup the test areas to have top-aligned bar excluded from work area.
   const gfx::Rect primary_scren_area(0, 0, 800, 600);
   const gfx::Rect work_area(0, 10, 800, 590);
   SetTestingAreas(primary_scren_area, work_area);
 
   PanelManager* panel_manager = PanelManager::GetInstance();
   Panel* panel = CreateDetachedPanel("1", gfx::Rect(300, 200, 250, 200));
   gfx::Rect bounds = panel->GetBounds();
 
   // Try resizing by the top left corner.
@@ skipping 22 matching lines @@
   bounds.set_height(bounds.height() + bounds.y() - mouse_location.y());
   bounds.set_x(mouse_location.x());
   bounds.set_y(mouse_location.y());
   EXPECT_EQ(bounds, panel->GetBounds());
 
   panel_manager->EndResizingByMouse(false);
   EXPECT_EQ(bounds, panel->GetBounds());
 
   panel_manager->CloseAll();
 }