Modify old Panel test files and include them in .gyp.

chrome/browser/ui/panels/old_panel_drag_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/message_loop.h"
-#include "chrome/browser/ui/panels/base_panel_browser_test.h"
+#include "chrome/browser/ui/panels/old_base_panel_browser_test.h"
 #include "chrome/browser/ui/panels/detached_panel_strip.h"
 #include "chrome/browser/ui/panels/docked_panel_strip.h"
 #include "chrome/browser/ui/panels/native_panel.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_drag_controller.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/test_panel_mouse_watcher.h"
 
-class PanelDragBrowserTest : public BasePanelBrowserTest {
+class OldPanelDragBrowserTest : public OldBasePanelBrowserTest {
  public:
-  PanelDragBrowserTest() : BasePanelBrowserTest() {
+  OldPanelDragBrowserTest() : OldBasePanelBrowserTest() {
   }
 
-  virtual ~PanelDragBrowserTest() {
+  virtual ~OldPanelDragBrowserTest() {
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
-    BasePanelBrowserTest::SetUpOnMainThread();
+    OldBasePanelBrowserTest::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);
   }
 
   // Drag |panel| from its origin by the offset |delta|.
@@ skipping 39 matching lines @@
 
   static gfx::Point GetDragDeltaToAttach(Panel* panel) {
     int distance = panel->manager()->docked_strip()->display_area().bottom() -
                    panel->GetBounds().bottom();
     return gfx::Point(
         -20,
         distance - PanelDragController::GetDockDetachedPanelThreshold() / 2);
   }
 };
 
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragOneDockedPanel) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, DragOneDockedPanel) {
   static const int big_delta_x = 70;
   static const int big_delta_y = 30;  // Do not exceed the threshold to detach.
 
   Panel* panel = CreateDockedPanel("1", gfx::Rect(0, 0, 100, 100));
   scoped_ptr<NativePanelTesting> panel_testing(
       NativePanelTesting::Create(panel->native_panel()));
   gfx::Rect panel_old_bounds = panel->GetBounds();
 
   // Drag left.
   gfx::Point mouse_location = panel_old_bounds.origin();
@@ skipping 71 matching lines @@
   mouse_location.Offset(0, big_delta_y);
   panel_testing->DragTitlebar(mouse_location);
   EXPECT_EQ(panel_old_bounds, panel->GetBounds());
 
   panel_testing->FinishDragTitlebar();
   EXPECT_EQ(panel_old_bounds, panel->GetBounds());
 
   PanelManager::GetInstance()->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragTwoDockedPanels) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, DragTwoDockedPanels) {
   static const gfx::Point small_delta(10, 0);
 
   Panel* panel1 = CreateDockedPanel("1", gfx::Rect(0, 0, 100, 100));
   Panel* panel2 = CreateDockedPanel("2", gfx::Rect(0, 0, 100, 100));
   scoped_ptr<NativePanelTesting> panel1_testing(
       NativePanelTesting::Create(panel1->native_panel()));
   scoped_ptr<NativePanelTesting> panel2_testing(
       NativePanelTesting::Create(panel2->native_panel()));
   gfx::Point position1 = panel1->GetBounds().origin();
   gfx::Point position2 = panel2->GetBounds().origin();
@@ skipping 75 matching lines @@
   EXPECT_EQ(mouse_location, panel1->GetBounds().origin());
   EXPECT_EQ(position1, panel2->GetBounds().origin());
 
   panel1_testing->CancelDragTitlebar();
   EXPECT_EQ(position1, panel1->GetBounds().origin());
   EXPECT_EQ(position2, panel2->GetBounds().origin());
 
   PanelManager::GetInstance()->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragThreeDockedPanels) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, DragThreeDockedPanels) {
   Panel* panel1 = CreateDockedPanel("1", gfx::Rect(0, 0, 100, 100));
   Panel* panel2 = CreateDockedPanel("2", gfx::Rect(0, 0, 100, 100));
   Panel* panel3 = CreateDockedPanel("3", gfx::Rect(0, 0, 100, 100));
   scoped_ptr<NativePanelTesting> panel2_testing(
       NativePanelTesting::Create(panel2->native_panel()));
   scoped_ptr<NativePanelTesting> panel3_testing(
       NativePanelTesting::Create(panel3->native_panel()));
   gfx::Point position1 = panel1->GetBounds().origin();
   gfx::Point position2 = panel2->GetBounds().origin();
   gfx::Point position3 = panel3->GetBounds().origin();
@@ skipping 112 matching lines @@
   EXPECT_EQ(mouse_location, panel3->GetBounds().origin());
 
   panel3_testing->CancelDragTitlebar();
   EXPECT_EQ(position2, panel1->GetBounds().origin());
   EXPECT_EQ(position3, panel2->GetBounds().origin());
   EXPECT_EQ(position1, panel3->GetBounds().origin());
 
   PanelManager::GetInstance()->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragMinimizedPanel) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, DragMinimizedPanel) {
   // We'll simulate mouse movements for test.
   PanelMouseWatcher* mouse_watcher = new TestPanelMouseWatcher();
   PanelManager::GetInstance()->SetMouseWatcherForTesting(mouse_watcher);
 
   Panel* panel = CreatePanel("panel1");
   scoped_ptr<NativePanelTesting> panel_testing(
       NativePanelTesting::Create(panel->native_panel()));
 
   panel->Minimize();
   EXPECT_EQ(Panel::MINIMIZED, panel->expansion_state());
@@ skipping 21 matching lines @@
   // mouse moves away from panel.
   panel_testing->FinishDragTitlebar();
   EXPECT_EQ(Panel::TITLE_ONLY, panel->expansion_state());
 
   MoveMouseAndWaitForExpansionStateChange(panel, mouse_location);
   EXPECT_EQ(Panel::MINIMIZED, panel->expansion_state());
 
   panel->Close();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest,
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest,
                        DragMinimizedPanelWhileDrawingAttention) {
   // We'll simulate mouse movements for test.
   PanelMouseWatcher* mouse_watcher = new TestPanelMouseWatcher();
   PanelManager::GetInstance()->SetMouseWatcherForTesting(mouse_watcher);
 
   Panel* panel = CreatePanel("panel1");
   scoped_ptr<NativePanelTesting> panel_testing(
       NativePanelTesting::Create(panel->native_panel()));
   CreatePanel("panel2");
 
@@ skipping 27 matching lines @@
   panel_testing->FinishDragTitlebar();
   EXPECT_EQ(Panel::TITLE_ONLY, panel->expansion_state());
 
   mouse_location.Offset(0, -50);
   MoveMouseAndWaitForExpansionStateChange(panel, mouse_location);
   EXPECT_EQ(Panel::MINIMIZED, panel->expansion_state());
 
   PanelManager::GetInstance()->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, CloseDockedPanelOnDrag) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, CloseDockedPanelOnDrag) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   PanelDragController* drag_controller = panel_manager->drag_controller();
   DockedPanelStrip* docked_strip = panel_manager->docked_strip();
 
   // Create 4 docked panels.
   // We have:  P4  P3  P2  P1
   Panel* panel1 = CreatePanelWithBounds("Panel1", gfx::Rect(0, 0, 100, 100));
   Panel* panel2 = CreatePanelWithBounds("Panel2", gfx::Rect(0, 0, 100, 100));
   Panel* panel3 = CreatePanelWithBounds("Panel3", gfx::Rect(0, 0, 100, 100));
   Panel* panel4 = CreatePanelWithBounds("Panel4", gfx::Rect(0, 0, 100, 100));
@@ skipping 143 matching lines @@
 
     ASSERT_EQ(1, docked_strip->num_panels());
     panels = PanelManager::GetInstance()->panels();
     EXPECT_EQ(panel4, panels[0]);
     EXPECT_EQ(position1, panel4->GetBounds().origin());
   }
 
   panel_manager->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragOneDetachedPanel) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, DragOneDetachedPanel) {
   Panel* panel = CreateDetachedPanel("1", gfx::Rect(300, 200, 250, 200));
 
   // Test that the detached panel can be dragged almost anywhere except getting
   // close to the bottom of the docked area to trigger the attach.
   scoped_ptr<NativePanelTesting> panel_testing(
       NativePanelTesting::Create(panel->native_panel()));
   gfx::Point origin = panel->GetBounds().origin();
 
   panel_testing->PressLeftMouseButtonTitlebar(origin);
   EXPECT_EQ(origin, panel->GetBounds().origin());
@@ skipping 25 matching lines @@
   panel_testing->DragTitlebar(origin);
   EXPECT_EQ(origin, panel->GetBounds().origin());
 
   panel_testing->CancelDragTitlebar();
   WaitForBoundsAnimationFinished(panel);
   EXPECT_EQ(original_position, panel->GetBounds().origin());
 
   PanelManager::GetInstance()->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, CloseDetachedPanelOnDrag) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, CloseDetachedPanelOnDrag) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   PanelDragController* drag_controller = panel_manager->drag_controller();
   DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
 
   // Create 4 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));
   Panel* panel4 = CreateDetachedPanel("4", gfx::Rect(400, 230, 130, 130));
   ASSERT_EQ(4, detached_strip->num_panels());
@@ skipping 118 matching lines @@
     EXPECT_FALSE(drag_controller->IsDragging());
 
     ASSERT_EQ(1, detached_strip->num_panels());
     EXPECT_TRUE(detached_strip->HasPanel(panel4));
     EXPECT_EQ(panel4_position, panel4->GetBounds().origin());
   }
 
   panel_manager->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, Detach) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, Detach) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   DockedPanelStrip* docked_strip = panel_manager->docked_strip();
   DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
 
   // Create one docked panel.
   Panel* panel = CreateDockedPanel("1", gfx::Rect(0, 0, 100, 100));
   ASSERT_EQ(1, docked_strip->num_panels());
   ASSERT_EQ(0, detached_strip->num_panels());
 
   gfx::Rect panel_old_bounds = panel->GetBounds();
@@ skipping 34 matching lines @@
   // Expect that the panel stays as detached.
   panel_testing->FinishDragTitlebar();
   ASSERT_EQ(0, docked_strip->num_panels());
   ASSERT_EQ(1, detached_strip->num_panels());
   EXPECT_EQ(PanelStrip::DETACHED, panel->panel_strip()->type());
   EXPECT_EQ(panel_new_bounds, panel->GetBounds());
 
   panel_manager->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DetachAndCancel) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, DetachAndCancel) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   DockedPanelStrip* docked_strip = panel_manager->docked_strip();
   DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
 
   // Create one docked panel.
   Panel* panel = CreateDockedPanel("1", gfx::Rect(0, 0, 100, 100));
   ASSERT_EQ(1, docked_strip->num_panels());
   ASSERT_EQ(0, detached_strip->num_panels());
 
   gfx::Rect panel_old_bounds = panel->GetBounds();
@@ skipping 34 matching lines @@
   // Expect that the panel is back as docked.
   panel_testing->CancelDragTitlebar();
   ASSERT_EQ(1, docked_strip->num_panels());
   ASSERT_EQ(0, detached_strip->num_panels());
   EXPECT_EQ(PanelStrip::DOCKED, panel->panel_strip()->type());
   EXPECT_EQ(panel_old_bounds, panel->GetBounds());
 
   panel_manager->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, Attach) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, Attach) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   DockedPanelStrip* docked_strip = panel_manager->docked_strip();
   DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
 
   // Create one detached panel.
   Panel* panel = CreateDetachedPanel("1", gfx::Rect(400, 300, 100, 100));
   ASSERT_EQ(0, docked_strip->num_panels());
   ASSERT_EQ(1, detached_strip->num_panels());
   EXPECT_EQ(PanelStrip::DETACHED, panel->panel_strip()->type());
 
@@ skipping 38 matching lines @@
   EXPECT_EQ(PanelStrip::DOCKED, panel->panel_strip()->type());
   panel_new_bounds.set_x(
       docked_strip->StartingRightPosition() - panel_new_bounds.width());
   panel_new_bounds.set_y(
       docked_strip->display_area().bottom() - panel_new_bounds.height());
   EXPECT_EQ(panel_new_bounds, panel->GetBounds());
 
   panel_manager->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, AttachAndCancel) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, AttachAndCancel) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   DockedPanelStrip* docked_strip = panel_manager->docked_strip();
   DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
 
   // Create one detached panel.
   Panel* panel = CreateDetachedPanel("1", gfx::Rect(400, 300, 100, 100));
   ASSERT_EQ(0, docked_strip->num_panels());
   ASSERT_EQ(1, detached_strip->num_panels());
   EXPECT_EQ(PanelStrip::DETACHED, panel->panel_strip()->type());
 
@@ skipping 34 matching lines @@
   // Expect that the panel is back as detached.
   panel_testing->CancelDragTitlebar();
   ASSERT_EQ(0, docked_strip->num_panels());
   ASSERT_EQ(1, detached_strip->num_panels());
   EXPECT_EQ(PanelStrip::DETACHED, panel->panel_strip()->type());
   EXPECT_EQ(panel_old_bounds, panel->GetBounds());
 
   panel_manager->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DetachAttachAndCancel) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, DetachAttachAndCancel) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   DockedPanelStrip* docked_strip = panel_manager->docked_strip();
   DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
 
   // Create one docked panel.
   Panel* panel = CreateDockedPanel("1", gfx::Rect(0, 0, 100, 100));
   ASSERT_EQ(1, docked_strip->num_panels());
   ASSERT_EQ(0, detached_strip->num_panels());
 
   gfx::Rect panel_old_bounds = panel->GetBounds();
@@ skipping 40 matching lines @@
   // Expect that the panel stays as docked.
   panel_testing->CancelDragTitlebar();
   ASSERT_EQ(1, docked_strip->num_panels());
   ASSERT_EQ(0, detached_strip->num_panels());
   EXPECT_EQ(PanelStrip::DOCKED, panel->panel_strip()->type());
   EXPECT_EQ(panel_old_bounds, panel->GetBounds());
 
   panel_manager->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DetachWithSqueeze) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, DetachWithSqueeze) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   DockedPanelStrip* docked_strip = panel_manager->docked_strip();
   DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
 
   gfx::Point drag_delta_to_detach = GetDragDeltaToDetach();
 
   // Create some docked panels.
   //   docked:    P1  P2  P3  P4  P5
   Panel* panel1 = CreateDockedPanel("1", gfx::Rect(0, 0, 200, 100));
   Panel* panel2 = CreateDockedPanel("2", gfx::Rect(0, 0, 200, 100));
@@ skipping 60 matching lines @@
 
   // No more squeeze, docked panels should stay put.
   EXPECT_EQ(docked_position1, panel3->GetBounds().origin());
   EXPECT_EQ(panel1->GetBounds().width(), panel1->GetRestoredBounds().width());
   EXPECT_EQ(docked_position2, panel5->GetBounds().origin());
   EXPECT_EQ(panel2->GetBounds().width(), panel2->GetRestoredBounds().width());
 
   panel_manager->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, AttachWithSqueeze) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, AttachWithSqueeze) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   DockedPanelStrip* docked_strip = panel_manager->docked_strip();
   DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
 
   // Create some detached, docked panels.
   //   detached:  P1  P2  P3
   //   docked:    P4  P5  P6  P7
   Panel* panel1 = CreateDetachedPanel("1", gfx::Rect(100, 300, 200, 100));
   Panel* panel2 = CreateDetachedPanel("2", gfx::Rect(200, 300, 200, 100));
   Panel* panel3 = CreateDetachedPanel("3", gfx::Rect(400, 300, 200, 100));
@@ skipping 87 matching lines @@
   EXPECT_EQ(PanelStrip::DOCKED, panel2->panel_strip()->type());
   EXPECT_EQ(PanelStrip::DOCKED, panel3->panel_strip()->type());
   EXPECT_EQ(PanelStrip::DOCKED, panel4->panel_strip()->type());
   EXPECT_EQ(PanelStrip::DOCKED, panel5->panel_strip()->type());
   EXPECT_EQ(PanelStrip::DOCKED, panel6->panel_strip()->type());
   EXPECT_EQ(PanelStrip::DOCKED, panel7->panel_strip()->type());
 
   panel_manager->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragDetachedPanelToTop) {
+IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, DragDetachedPanelToTop) {
   // Setup the test areas to have top-aligned bar excluded from work area.
   const gfx::Rect primary_screen_area(0, 0, 800, 600);
   const gfx::Rect work_area(0, 10, 800, 590);
   SetTestingAreas(primary_screen_area, work_area);
 
   PanelManager* panel_manager = PanelManager::GetInstance();
   Panel* panel = CreateDetachedPanel("1", gfx::Rect(300, 200, 250, 200));
 
   // Drag up the panel. Expect that the panel should not go outside the top of
   // the work area.
   gfx::Point drag_to_location(250, 0);
   DragPanelToMouseLocation(panel, drag_to_location);
   EXPECT_EQ(PanelStrip::DETACHED, panel->panel_strip()->type());
   EXPECT_EQ(drag_to_location.x(), panel->GetBounds().origin().x());
   EXPECT_EQ(work_area.y(), panel->GetBounds().origin().y());
 
   // Drag down the panel. Expect that the panel can be dragged without
   // constraint.
   drag_to_location = gfx::Point(280, 150);
   DragPanelToMouseLocation(panel, drag_to_location);
   EXPECT_EQ(PanelStrip::DETACHED, panel->panel_strip()->type());
   EXPECT_EQ(drag_to_location, panel->GetBounds().origin());
 
   panel_manager->CloseAll();
 }