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

chrome/browser/ui/panels/old_docked_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/message_loop.h"
-#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/docked_panel_strip.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/test_panel_mouse_watcher.h"
 
-class OldDockedPanelBrowserTest : public OldBasePanelBrowserTest {
+class DockedPanelBrowserTest : public BasePanelBrowserTest {
  public:
   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(OldDockedPanelBrowserTest, SqueezePanelsInDock) {
+IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, SqueezePanelsInDock) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   DockedPanelStrip* docked_strip = panel_manager->docked_strip();
 
   // Create some docked panels.
   Panel* panel1 = CreateDockedPanel("1", gfx::Rect(0, 0, 200, 100));
   Panel* panel2 = CreateDockedPanel("2", gfx::Rect(0, 0, 200, 100));
   Panel* panel3 = CreateDockedPanel("3", gfx::Rect(0, 0, 200, 100));
   ASSERT_EQ(3, docked_strip->num_panels());
 
   // Check that nothing has been squeezed so far.
@@ skipping 41 matching lines @@
   EXPECT_LT(panel1->GetBounds().width(), panel1->GetRestoredBounds().width());
   EXPECT_LT(panel3->GetBounds().width(), panel3->GetRestoredBounds().width());
   EXPECT_LT(panel4->GetBounds().width(), panel4->GetRestoredBounds().width());
   EXPECT_LT(panel5->GetBounds().width(), panel5->GetRestoredBounds().width());
   EXPECT_LT(panel6->GetBounds().width(), panel6->GetRestoredBounds().width());
   EXPECT_LT(panel7->GetBounds().width(), panel7->GetRestoredBounds().width());
 
   panel_manager->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(OldDockedPanelBrowserTest, SqueezeAndThenSomeMore) {
+IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, SqueezeAndThenSomeMore) {
   PanelManager* panel_manager = PanelManager::GetInstance();
 
   // Create enough docked panels to get into squeezing.
   Panel* panel1 = CreateDockedPanel("1", gfx::Rect(0, 0, 200, 100));
   Panel* panel2 = CreateDockedPanel("2", gfx::Rect(0, 0, 200, 100));
   Panel* panel3 = CreateDockedPanel("3", gfx::Rect(0, 0, 200, 100));
   Panel* panel4 = CreateDockedPanel("4", gfx::Rect(0, 0, 200, 100));
   Panel* panel5 = CreateDockedPanel("5", gfx::Rect(0, 0, 200, 100));
   Panel* panel6 = CreateDockedPanel("6", gfx::Rect(0, 0, 200, 100));
 
@@ skipping 31 matching lines @@
   // The panels should shrink in width.
   EXPECT_LT(panel1->GetBounds().width(), panel_1_width_less_squeezed);
   EXPECT_LT(panel2->GetBounds().width(), panel_2_width_less_squeezed);
   EXPECT_LT(panel3->GetBounds().width(), panel_3_width_less_squeezed);
   EXPECT_LT(panel4->GetBounds().width(), panel_4_width_less_squeezed);
   EXPECT_LT(panel5->GetBounds().width(), panel_5_width_less_squeezed);
 
   panel_manager->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(OldDockedPanelBrowserTest, MinimizeSqueezedActive) {
+IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, MinimizeSqueezedActive) {
   PanelManager* panel_manager = PanelManager::GetInstance();
 
   // Create enough docked panels to get into squeezing.
   Panel* panel1 = CreateDockedPanel("1", gfx::Rect(0, 0, 200, 100));
   Panel* panel2 = CreateDockedPanel("2", gfx::Rect(0, 0, 200, 100));
   Panel* panel3 = CreateDockedPanel("3", gfx::Rect(0, 0, 200, 100));
   Panel* panel4 = CreateDockedPanel("4", gfx::Rect(0, 0, 200, 100));
   Panel* panel5 = CreateDockedPanel("5", gfx::Rect(0, 0, 200, 100));
   Panel* panel6 = CreateDockedPanel("6", gfx::Rect(0, 0, 200, 100));
   Panel* panel7 = CreateDockedPanel("7", gfx::Rect(0, 0, 200, 100));
@@ skipping 33 matching lines @@
 
   // Wait for the scheduled layout to run.
   MessageLoopForUI::current()->RunAllPending();
 
   // The minimized panel should now be at reduced width.
   EXPECT_LT(panel7->GetBounds().width(), panel7->GetRestoredBounds().width());
 
   panel_manager->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(OldDockedPanelBrowserTest, CloseSqueezedPanels) {
+IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, CloseSqueezedPanels) {
   PanelManager* panel_manager = PanelManager::GetInstance();
 
   // Create enough docked panels to get into squeezing.
   Panel* panel1 = CreateDockedPanel("1", gfx::Rect(0, 0, 200, 100));
   Panel* panel2 = CreateDockedPanel("2", gfx::Rect(0, 0, 200, 100));
   Panel* panel3 = CreateDockedPanel("3", gfx::Rect(0, 0, 200, 100));
   Panel* panel4 = CreateDockedPanel("4", gfx::Rect(0, 0, 200, 100));
   Panel* panel5 = CreateDockedPanel("5", gfx::Rect(0, 0, 200, 100));
   Panel* panel6 = CreateDockedPanel("6", gfx::Rect(0, 0, 200, 100));
   Panel* panel7 = CreateDockedPanel("7", gfx::Rect(0, 0, 200, 100));
@@ skipping 48 matching lines @@
   // Wait for all processing to finish.
   MessageLoopForUI::current()->RunAllPending();
 
   // We should not have squeezing any more; all panels should be at full width.
   EXPECT_EQ(panel1->GetBounds().width(), panel1->GetRestoredBounds().width());
   EXPECT_EQ(panel4->GetBounds().width(), panel4->GetRestoredBounds().width());
   EXPECT_EQ(panel6->GetBounds().width(), panel6->GetRestoredBounds().width());
 
   panel_manager->CloseAll();
 }