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

BUG=None
TEST=Old tests set up to be runnable.

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=141690

Review URL: https://chromiumcodereview.appspot.com/10544105

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141694 0039d316-1c4b-4281-b951-d872f2087c98

14 files changed, 174 insertions, 168 deletions

diff --git a/chrome/browser/ui/panels/base_panel_browser_test.cc b/chrome/browser/ui/panels/base_panel_browser_test.cc
index 52180e7..a472bfe 100644
--- a/chrome/browser/ui/panels/base_panel_browser_test.cc
+++ b/chrome/browser/ui/panels/base_panel_browser_test.cc
@@ -330,20 +330,6 @@ Panel* BasePanelBrowserTest::CreatePanelWithParams(
     EXPECT_TRUE(panel->auto_resizable());
   }
 
-#if defined(OS_LINUX)
-  // On bots, we might have a simple window manager which always activates new
-  // windows, and can't always deactivate them. Keep track of the previously
-  // active window so we can activate that window back to ensure the new window
-  // is inactive.
-  Browser* last_active_browser_to_restore = NULL;
-  if (params.expected_active_state == SHOW_AS_INACTIVE &&
-      ui::GuessWindowManager() == ui::WM_ICE_WM) {
-    last_active_browser_to_restore = BrowserList::GetLastActive();
-    EXPECT_TRUE(last_active_browser_to_restore);
-    EXPECT_NE(last_active_browser_to_restore, panel_browser);
-  }
-#endif
-
   if (params.show_flag == SHOW_AS_ACTIVE) {
     panel->Show();
   } else {
@@ -354,9 +340,13 @@ Panel* BasePanelBrowserTest::CreatePanelWithParams(
     MessageLoopForUI::current()->RunAllPending();
 
 #if defined(OS_LINUX)
-    // Restore focus where it was. It will deactivate the new panel.
-    if (last_active_browser_to_restore)
-      last_active_browser_to_restore->window()->Activate();
+    // On bots, we might have a simple window manager which always activates new
+    // windows, and can't always deactivate them. Re-activate the main tabbed
+    // browser to "deactivate" the newly created panel.
+    if (params.expected_active_state == SHOW_AS_INACTIVE &&
+        ui::GuessWindowManager() == ui::WM_ICE_WM) {
+      browser()->window()->Activate();
+    }
 #endif
     // More waiting, because gaining or losing focus may require inter-process
     // asynchronous communication, and it is not enough to just run the local
diff --git a/chrome/browser/ui/panels/native_panel.h b/chrome/browser/ui/panels/native_panel.h
index 527fbba..03a55bb 100644
--- a/chrome/browser/ui/panels/native_panel.h
+++ b/chrome/browser/ui/panels/native_panel.h
@@ -36,6 +36,7 @@ class NativePanel {
   friend class Panel;
   friend class PanelBrowserWindow;
   friend class PanelBrowserTest;
+  friend class OldPanelBrowserTest;
 
  protected:
   virtual ~NativePanel() {}
diff --git a/chrome/browser/ui/panels/old_base_panel_browser_test.cc b/chrome/browser/ui/panels/old_base_panel_browser_test.cc
index 52180e7..662878d 100644
--- a/chrome/browser/ui/panels/old_base_panel_browser_test.cc
+++ b/chrome/browser/ui/panels/old_base_panel_browser_test.cc
@@ -2,7 +2,7 @@
 // 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/base_panel_browser_test.h"
+#include "chrome/browser/ui/panels/old_base_panel_browser_test.h"
 
 #include "chrome/browser/ui/browser_list.h"
 
@@ -55,7 +55,7 @@ struct MockDesktopBar {
 };
 
 class MockDisplaySettingsProviderImpl :
-    public BasePanelBrowserTest::MockDisplaySettingsProvider {
+    public OldBasePanelBrowserTest::MockDisplaySettingsProvider {
  public:
   explicit MockDisplaySettingsProviderImpl(PanelManager* panel_manager);
   virtual ~MockDisplaySettingsProviderImpl() { }
@@ -187,10 +187,10 @@ bool ExistsPanel(Panel* panel) {
 
 }  // namespace
 
-const FilePath::CharType* BasePanelBrowserTest::kTestDir =
+const FilePath::CharType* OldBasePanelBrowserTest::kTestDir =
     FILE_PATH_LITERAL("panels");
 
-BasePanelBrowserTest::BasePanelBrowserTest()
+OldBasePanelBrowserTest::OldBasePanelBrowserTest()
     : InProcessBrowserTest(),
       mock_display_settings_enabled_(true) {
 #if defined(OS_MACOSX)
@@ -198,10 +198,10 @@ BasePanelBrowserTest::BasePanelBrowserTest()
 #endif
 }
 
-BasePanelBrowserTest::~BasePanelBrowserTest() {
+OldBasePanelBrowserTest::~OldBasePanelBrowserTest() {
 }
 
-bool BasePanelBrowserTest::SkipTestIfIceWM() {
+bool OldBasePanelBrowserTest::SkipTestIfIceWM() {
 #if defined(OS_LINUX)
   return ui::GuessWindowManager() == ui::WM_ICE_WM;
 #else
@@ -209,7 +209,7 @@ bool BasePanelBrowserTest::SkipTestIfIceWM() {
 #endif
 }
 
-bool BasePanelBrowserTest::SkipTestIfCompizWM() {
+bool OldBasePanelBrowserTest::SkipTestIfCompizWM() {
 #if defined(OS_LINUX)
   return ui::GuessWindowManager() == ui::WM_COMPIZ;
 #else
@@ -217,12 +217,12 @@ bool BasePanelBrowserTest::SkipTestIfCompizWM() {
 #endif
 }
 
-void BasePanelBrowserTest::SetUpCommandLine(CommandLine* command_line) {
+void OldBasePanelBrowserTest::SetUpCommandLine(CommandLine* command_line) {
   EnableDOMAutomation();
   command_line->AppendSwitch(switches::kEnablePanels);
 }
 
-void BasePanelBrowserTest::SetUpOnMainThread() {
+void OldBasePanelBrowserTest::SetUpOnMainThread() {
   InProcessBrowserTest::SetUpOnMainThread();
 
   // Setup the work area and desktop bar so that we have consistent testing
@@ -243,7 +243,7 @@ void BasePanelBrowserTest::SetUpOnMainThread() {
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
 }
 
-void BasePanelBrowserTest::WaitForPanelActiveState(
+void OldBasePanelBrowserTest::WaitForPanelActiveState(
     Panel* panel, ActiveState expected_state) {
   DCHECK(expected_state == SHOW_AS_ACTIVE ||
          expected_state == SHOW_AS_INACTIVE);
@@ -257,7 +257,7 @@ void BasePanelBrowserTest::WaitForPanelActiveState(
   EXPECT_TRUE(panel->IsActive() == (expected_state == SHOW_AS_ACTIVE));
 }
 
-void BasePanelBrowserTest::WaitForWindowSizeAvailable(Panel* panel) {
+void OldBasePanelBrowserTest::WaitForWindowSizeAvailable(Panel* panel) {
   scoped_ptr<NativePanelTesting> panel_testing(
       NativePanelTesting::Create(panel->native_panel()));
   ui_test_utils::WindowedNotificationObserver signal(
@@ -269,7 +269,7 @@ void BasePanelBrowserTest::WaitForWindowSizeAvailable(Panel* panel) {
   EXPECT_TRUE(panel_testing->IsWindowSizeKnown());
 }
 
-void BasePanelBrowserTest::WaitForBoundsAnimationFinished(Panel* panel) {
+void OldBasePanelBrowserTest::WaitForBoundsAnimationFinished(Panel* panel) {
   scoped_ptr<NativePanelTesting> panel_testing(
       NativePanelTesting::Create(panel->native_panel()));
   ui_test_utils::WindowedNotificationObserver signal(
@@ -281,7 +281,7 @@ void BasePanelBrowserTest::WaitForBoundsAnimationFinished(Panel* panel) {
   EXPECT_TRUE(!panel_testing->IsAnimatingBounds());
 }
 
-void BasePanelBrowserTest::WaitForExpansionStateChanged(
+void OldBasePanelBrowserTest::WaitForExpansionStateChanged(
     Panel* panel, Panel::ExpansionState expansion_state) {
   ui_test_utils::WindowedNotificationObserver signal(
       chrome::NOTIFICATION_PANEL_CHANGED_EXPANSION_STATE,
@@ -292,7 +292,7 @@ void BasePanelBrowserTest::WaitForExpansionStateChanged(
   EXPECT_EQ(expansion_state, panel->expansion_state());
 }
 
-Panel* BasePanelBrowserTest::CreatePanelWithParams(
+Panel* OldBasePanelBrowserTest::CreatePanelWithParams(
     const CreatePanelParams& params) {
 #if defined(OS_MACOSX)
   // Opening panels on a Mac causes NSWindowController of the Panel window
@@ -330,20 +330,6 @@ Panel* BasePanelBrowserTest::CreatePanelWithParams(
     EXPECT_TRUE(panel->auto_resizable());
   }
 
-#if defined(OS_LINUX)
-  // On bots, we might have a simple window manager which always activates new
-  // windows, and can't always deactivate them. Keep track of the previously
-  // active window so we can activate that window back to ensure the new window
-  // is inactive.
-  Browser* last_active_browser_to_restore = NULL;
-  if (params.expected_active_state == SHOW_AS_INACTIVE &&
-      ui::GuessWindowManager() == ui::WM_ICE_WM) {
-    last_active_browser_to_restore = BrowserList::GetLastActive();
-    EXPECT_TRUE(last_active_browser_to_restore);
-    EXPECT_NE(last_active_browser_to_restore, panel_browser);
-  }
-#endif
-
   if (params.show_flag == SHOW_AS_ACTIVE) {
     panel->Show();
   } else {
@@ -354,9 +340,13 @@ Panel* BasePanelBrowserTest::CreatePanelWithParams(
     MessageLoopForUI::current()->RunAllPending();
 
 #if defined(OS_LINUX)
-    // Restore focus where it was. It will deactivate the new panel.
-    if (last_active_browser_to_restore)
-      last_active_browser_to_restore->window()->Activate();
+    // On bots, we might have a simple window manager which always activates new
+    // windows, and can't always deactivate them. Re-activate the main tabbed
+    // browser to "deactivate" the newly created panel.
+    if (params.expected_active_state == SHOW_AS_INACTIVE &&
+        ui::GuessWindowManager() == ui::WM_ICE_WM) {
+      browser()->window()->Activate();
+    }
 #endif
     // More waiting, because gaining or losing focus may require inter-process
     // asynchronous communication, and it is not enough to just run the local
@@ -374,25 +364,25 @@ Panel* BasePanelBrowserTest::CreatePanelWithParams(
   return panel;
 }
 
-Panel* BasePanelBrowserTest::CreatePanelWithBounds(
+Panel* OldBasePanelBrowserTest::CreatePanelWithBounds(
     const std::string& panel_name, const gfx::Rect& bounds) {
   CreatePanelParams params(panel_name, bounds, SHOW_AS_ACTIVE);
   return CreatePanelWithParams(params);
 }
 
-Panel* BasePanelBrowserTest::CreatePanel(const std::string& panel_name) {
+Panel* OldBasePanelBrowserTest::CreatePanel(const std::string& panel_name) {
   CreatePanelParams params(panel_name, gfx::Rect(), SHOW_AS_ACTIVE);
   return CreatePanelWithParams(params);
 }
 
-Panel* BasePanelBrowserTest::CreateDockedPanel(const std::string& name,
+Panel* OldBasePanelBrowserTest::CreateDockedPanel(const std::string& name,
                                                const gfx::Rect& bounds) {
   Panel* panel = CreatePanelWithBounds(name, bounds);
   EXPECT_EQ(PanelStrip::DOCKED, panel->panel_strip()->type());
   return panel;
 }
 
-Panel* BasePanelBrowserTest::CreateDetachedPanel(const std::string& name,
+Panel* OldBasePanelBrowserTest::CreateDetachedPanel(const std::string& name,
                                                  const gfx::Rect& bounds) {
   Panel* panel = CreatePanelWithBounds(name, bounds);
   panel->manager()->MovePanelToStrip(panel,
@@ -407,14 +397,14 @@ Panel* BasePanelBrowserTest::CreateDetachedPanel(const std::string& name,
   return panel;
 }
 
-void BasePanelBrowserTest::CreateTestTabContents(Browser* browser) {
+void OldBasePanelBrowserTest::CreateTestTabContents(Browser* browser) {
   TabContentsWrapper* tab_contents =
       new TabContentsWrapper(
           WebContentsTester::CreateTestWebContents(browser->profile(), NULL));
   browser->AddTab(tab_contents, content::PAGE_TRANSITION_LINK);
 }
 
-scoped_refptr<Extension> BasePanelBrowserTest::CreateExtension(
+scoped_refptr<Extension> OldBasePanelBrowserTest::CreateExtension(
     const FilePath::StringType& path,
     Extension::Location location,
     const DictionaryValue& extra_value) {
@@ -439,15 +429,16 @@ scoped_refptr<Extension> BasePanelBrowserTest::CreateExtension(
   return extension;
 }
 
-void BasePanelBrowserTest::SetTestingAreas(const gfx::Rect& primary_screen_area,
-                                           const gfx::Rect& work_area) {
+void OldBasePanelBrowserTest::SetTestingAreas(
+    const gfx::Rect& primary_screen_area,
+    const gfx::Rect& work_area) {
   DCHECK(primary_screen_area.Contains(work_area));
   mock_display_settings_provider_->SetPrimaryScreenArea(primary_screen_area);
   mock_display_settings_provider_->SetWorkArea(
       work_area.IsEmpty() ? primary_screen_area : work_area);
 }
 
-void BasePanelBrowserTest::CloseWindowAndWait(Panel* panel) {
+void OldBasePanelBrowserTest::CloseWindowAndWait(Panel* panel) {
   // Closing a panel may involve several async tasks. Need to use
   // message pump and wait for the notification.
   PanelManager* manager = PanelManager::GetInstance();
@@ -472,7 +463,7 @@ void BasePanelBrowserTest::CloseWindowAndWait(Panel* panel) {
 #endif  // OS_MACOSX
 }
 
-void BasePanelBrowserTest::MoveMouseAndWaitForExpansionStateChange(
+void OldBasePanelBrowserTest::MoveMouseAndWaitForExpansionStateChange(
     Panel* panel,
     const gfx::Point& position) {
   ui_test_utils::WindowedNotificationObserver signal(
@@ -482,11 +473,11 @@ void BasePanelBrowserTest::MoveMouseAndWaitForExpansionStateChange(
   signal.Wait();
 }
 
-void BasePanelBrowserTest::MoveMouse(const gfx::Point& position) {
+void OldBasePanelBrowserTest::MoveMouse(const gfx::Point& position) {
   PanelManager::GetInstance()->mouse_watcher()->NotifyMouseMovement(position);
 }
 
-std::string BasePanelBrowserTest::MakePanelName(int index) {
+std::string OldBasePanelBrowserTest::MakePanelName(int index) {
   std::string panel_name("Panel");
   return panel_name + base::IntToString(index);
 }
diff --git a/chrome/browser/ui/panels/old_base_panel_browser_test.h b/chrome/browser/ui/panels/old_base_panel_browser_test.h
index 03c4c9a..1ecca15 100644
--- a/chrome/browser/ui/panels/old_base_panel_browser_test.h
+++ b/chrome/browser/ui/panels/old_base_panel_browser_test.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_PANELS_BASE_PANEL_BROWSER_TEST_H_
-#define CHROME_BROWSER_UI_PANELS_BASE_PANEL_BROWSER_TEST_H_
+#ifndef CHROME_BROWSER_UI_PANELS_OLD_BASE_PANEL_BROWSER_TEST_H_
+#define CHROME_BROWSER_UI_PANELS_OLD_BASE_PANEL_BROWSER_TEST_H_
 #pragma once
 
 #include "base/values.h"
@@ -15,7 +15,7 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "ui/gfx/rect.h"
 
-class BasePanelBrowserTest : public InProcessBrowserTest {
+class OldBasePanelBrowserTest : public InProcessBrowserTest {
  public:
   class MockDisplaySettingsProvider : public DisplaySettingsProvider {
    public:
@@ -33,8 +33,8 @@ class BasePanelBrowserTest : public InProcessBrowserTest {
                                         int thickness) = 0;
   };
 
-  BasePanelBrowserTest();
-  virtual ~BasePanelBrowserTest();
+  OldBasePanelBrowserTest();
+  virtual ~OldBasePanelBrowserTest();
 
   // Linux bots use icewm which activate windows in ways that break
   // certain panel tests. Skip those tests when running on the bots.
@@ -124,4 +124,4 @@ class BasePanelBrowserTest : public InProcessBrowserTest {
   bool mock_display_settings_enabled_;
 };
 
-#endif  // CHROME_BROWSER_UI_PANELS_BASE_PANEL_BROWSER_TEST_H_
+#endif  // CHROME_BROWSER_UI_PANELS_OLD_BASE_PANEL_BROWSER_TEST_H_
diff --git a/chrome/browser/ui/panels/old_detached_panel_browsertest.cc b/chrome/browser/ui/panels/old_detached_panel_browsertest.cc
index feec61f..df7af4f 100644
--- a/chrome/browser/ui/panels/old_detached_panel_browsertest.cc
+++ b/chrome/browser/ui/panels/old_detached_panel_browsertest.cc
@@ -3,16 +3,17 @@
 // 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/native_panel.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 
-class DetachedPanelBrowserTest : public BasePanelBrowserTest {
+class OldDetachedPanelBrowserTest : public OldBasePanelBrowserTest {
 };
 
-IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest, CheckDetachedPanelProperties) {
+IN_PROC_BROWSER_TEST_F(OldDetachedPanelBrowserTest,
+                       CheckDetachedPanelProperties) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
 
@@ -39,7 +40,7 @@ IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest, CheckDetachedPanelProperties) {
   panel_manager->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest, DrawAttentionOnActive) {
+IN_PROC_BROWSER_TEST_F(OldDetachedPanelBrowserTest, DrawAttentionOnActive) {
   // Create a detached panel that is initially active.
   Panel* panel = CreateDetachedPanel("1", gfx::Rect(300, 200, 250, 200));
   scoped_ptr<NativePanelTesting> native_panel_testing(
@@ -57,7 +58,7 @@ IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest, DrawAttentionOnActive) {
   panel->Close();
 }
 
-IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest, DrawAttentionOnInactive) {
+IN_PROC_BROWSER_TEST_F(OldDetachedPanelBrowserTest, DrawAttentionOnInactive) {
   // Create an inactive detached panel.
   Panel* panel = CreateDetachedPanel("1", gfx::Rect(300, 200, 250, 200));
   panel->Deactivate();
@@ -83,7 +84,8 @@ IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest, DrawAttentionOnInactive) {
   panel->Close();
 }
 
-IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest, DrawAttentionResetOnActivate) {
+IN_PROC_BROWSER_TEST_F(OldDetachedPanelBrowserTest,
+                       DrawAttentionResetOnActivate) {
   // Create 2 panels so we end up with an inactive panel that can
   // be made to draw attention.
   Panel* panel1 = CreatePanel("test panel1");
@@ -108,7 +110,7 @@ IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest, DrawAttentionResetOnActivate) {
   panel2->Close();
 }
 
-IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest, ClickTitlebar) {
+IN_PROC_BROWSER_TEST_F(OldDetachedPanelBrowserTest, ClickTitlebar) {
   PanelManager* panel_manager = PanelManager::GetInstance();
 
   Panel* panel = CreateDetachedPanel("1", gfx::Rect(300, 200, 250, 200));
diff --git a/chrome/browser/ui/panels/old_docked_panel_browsertest.cc b/chrome/browser/ui/panels/old_docked_panel_browsertest.cc
index 9bf0277..0c15ec5 100644
--- a/chrome/browser/ui/panels/old_docked_panel_browsertest.cc
+++ b/chrome/browser/ui/panels/old_docked_panel_browsertest.cc
@@ -3,16 +3,16 @@
 // 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/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 DockedPanelBrowserTest : public BasePanelBrowserTest {
+class OldDockedPanelBrowserTest : public OldBasePanelBrowserTest {
  public:
   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.
@@ -23,7 +23,7 @@ class DockedPanelBrowserTest : public BasePanelBrowserTest {
   }
 };
 
-IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, SqueezePanelsInDock) {
+IN_PROC_BROWSER_TEST_F(OldDockedPanelBrowserTest, SqueezePanelsInDock) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   DockedPanelStrip* docked_strip = panel_manager->docked_strip();
 
@@ -85,7 +85,7 @@ IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, SqueezePanelsInDock) {
   panel_manager->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, SqueezeAndThenSomeMore) {
+IN_PROC_BROWSER_TEST_F(OldDockedPanelBrowserTest, SqueezeAndThenSomeMore) {
   PanelManager* panel_manager = PanelManager::GetInstance();
 
   // Create enough docked panels to get into squeezing.
@@ -137,7 +137,7 @@ IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, SqueezeAndThenSomeMore) {
   panel_manager->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, MinimizeSqueezedActive) {
+IN_PROC_BROWSER_TEST_F(OldDockedPanelBrowserTest, MinimizeSqueezedActive) {
   PanelManager* panel_manager = PanelManager::GetInstance();
 
   // Create enough docked panels to get into squeezing.
@@ -191,7 +191,7 @@ IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, MinimizeSqueezedActive) {
   panel_manager->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, CloseSqueezedPanels) {
+IN_PROC_BROWSER_TEST_F(OldDockedPanelBrowserTest, CloseSqueezedPanels) {
   PanelManager* panel_manager = PanelManager::GetInstance();
 
   // Create enough docked panels to get into squeezing.
diff --git a/chrome/browser/ui/panels/old_panel_and_desktop_notification_browsertest.cc b/chrome/browser/ui/panels/old_panel_and_desktop_notification_browsertest.cc
index 44128bf..0bb710a 100644
--- a/chrome/browser/ui/panels/old_panel_and_desktop_notification_browsertest.cc
+++ b/chrome/browser/ui/panels/old_panel_and_desktop_notification_browsertest.cc
@@ -11,7 +11,7 @@
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/ui/browser.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/panel.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/test_panel_mouse_watcher.h"
@@ -24,12 +24,12 @@
 // desktop notification code a chance to process the change notifications,
 // we call MessageLoopForUI::current()->RunAllPending() after any panel change
 // has been made.
-class PanelAndDesktopNotificationTest : public BasePanelBrowserTest {
+class OldPanelAndDesktopNotificationTest : public OldBasePanelBrowserTest {
  public:
-  PanelAndDesktopNotificationTest() : BasePanelBrowserTest() {
+  OldPanelAndDesktopNotificationTest() : OldBasePanelBrowserTest() {
   }
 
-  virtual ~PanelAndDesktopNotificationTest() {
+  virtual ~OldPanelAndDesktopNotificationTest() {
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
@@ -37,7 +37,7 @@ class PanelAndDesktopNotificationTest : public BasePanelBrowserTest {
     // does not have the hook up for testing work area.
     disable_display_settings_mock();
 
-    BasePanelBrowserTest::SetUpOnMainThread();
+    OldBasePanelBrowserTest::SetUpOnMainThread();
 
     g_browser_process->local_state()->SetInteger(
         prefs::kDesktopNotificationPosition, BalloonCollection::LOWER_RIGHT);
@@ -55,7 +55,7 @@ class PanelAndDesktopNotificationTest : public BasePanelBrowserTest {
     service_.reset();
     ui_manager_.reset();
 
-    BasePanelBrowserTest::CleanUpOnMainThread();
+    OldBasePanelBrowserTest::CleanUpOnMainThread();
   }
 
   content::ShowDesktopNotificationHostMsgParams StandardTestNotification() {
@@ -120,7 +120,7 @@ class PanelAndDesktopNotificationTest : public BasePanelBrowserTest {
   scoped_ptr<DesktopNotificationService> service_;
 };
 
-IN_PROC_BROWSER_TEST_F(PanelAndDesktopNotificationTest, AddAndClosePanel) {
+IN_PROC_BROWSER_TEST_F(OldPanelAndDesktopNotificationTest, AddAndClosePanel) {
   Balloon* balloon = CreateBalloon();
   int original_balloon_bottom = GetBalloonBottomPosition(balloon);
 
@@ -139,7 +139,7 @@ IN_PROC_BROWSER_TEST_F(PanelAndDesktopNotificationTest, AddAndClosePanel) {
   EXPECT_EQ(original_balloon_bottom, GetBalloonBottomPosition(balloon));
 }
 
-IN_PROC_BROWSER_TEST_F(PanelAndDesktopNotificationTest,
+IN_PROC_BROWSER_TEST_F(OldPanelAndDesktopNotificationTest,
                        ExpandAndCollapsePanel) {
   // Disable mouse watcher since we don't want mouse movements to affect panel
   // testing for title-only state.
@@ -183,7 +183,7 @@ IN_PROC_BROWSER_TEST_F(PanelAndDesktopNotificationTest,
   PanelManager::GetInstance()->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelAndDesktopNotificationTest, DragNarrowPanel) {
+IN_PROC_BROWSER_TEST_F(OldPanelAndDesktopNotificationTest, DragNarrowPanel) {
   Balloon* balloon = CreateBalloon();
 
   // Let the panel width be smaller than the balloon width.
@@ -207,7 +207,7 @@ IN_PROC_BROWSER_TEST_F(PanelAndDesktopNotificationTest, DragNarrowPanel) {
   PanelManager::GetInstance()->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelAndDesktopNotificationTest, DragWidePanel) {
+IN_PROC_BROWSER_TEST_F(OldPanelAndDesktopNotificationTest, DragWidePanel) {
   Balloon* balloon = CreateBalloon();
 
   // Let the panel width be greater than the balloon width.
@@ -233,7 +233,8 @@ IN_PROC_BROWSER_TEST_F(PanelAndDesktopNotificationTest, DragWidePanel) {
   PanelManager::GetInstance()->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelAndDesktopNotificationTest, DetachAndAttachPanel) {
+IN_PROC_BROWSER_TEST_F(OldPanelAndDesktopNotificationTest,
+                       DetachAndAttachPanel) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   Balloon* balloon = CreateBalloon();
   int original_balloon_bottom = GetBalloonBottomPosition(balloon);
@@ -266,7 +267,7 @@ IN_PROC_BROWSER_TEST_F(PanelAndDesktopNotificationTest, DetachAndAttachPanel) {
   panel_manager->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelAndDesktopNotificationTest, ResizePanel) {
+IN_PROC_BROWSER_TEST_F(OldPanelAndDesktopNotificationTest, ResizePanel) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   Balloon* balloon = CreateBalloon();
 
@@ -302,7 +303,7 @@ IN_PROC_BROWSER_TEST_F(PanelAndDesktopNotificationTest, ResizePanel) {
   panel_manager->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelAndDesktopNotificationTest, ResizePanelByMouse) {
+IN_PROC_BROWSER_TEST_F(OldPanelAndDesktopNotificationTest, ResizePanelByMouse) {
   Balloon* balloon = CreateBalloon();
 
   // Create a docked panel. Expect that the notification balloon moves up to be
@@ -331,7 +332,8 @@ IN_PROC_BROWSER_TEST_F(PanelAndDesktopNotificationTest, ResizePanelByMouse) {
   PanelManager::GetInstance()->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelAndDesktopNotificationTest, InteractWithTwoPanels) {
+IN_PROC_BROWSER_TEST_F(OldPanelAndDesktopNotificationTest,
+                       InteractWithTwoPanels) {
   Balloon* balloon = CreateBalloon();
   int original_balloon_bottom = GetBalloonBottomPosition(balloon);
 
diff --git a/chrome/browser/ui/panels/old_panel_browsertest.cc b/chrome/browser/ui/panels/old_panel_browsertest.cc
index e5b7d65..024285e 100644
--- a/chrome/browser/ui/panels/old_panel_browsertest.cc
+++ b/chrome/browser/ui/panels/old_panel_browsertest.cc
@@ -17,7 +17,7 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.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/docked_panel_strip.h"
 #include "chrome/browser/ui/panels/native_panel.h"
 #include "chrome/browser/ui/panels/panel.h"
@@ -46,9 +46,9 @@ using content::DownloadManager;
 using content::WebContents;
 using extensions::Extension;
 
-class PanelBrowserTest : public BasePanelBrowserTest {
+class OldPanelBrowserTest : public OldBasePanelBrowserTest {
  public:
-  PanelBrowserTest() : BasePanelBrowserTest() {
+  OldPanelBrowserTest() : OldBasePanelBrowserTest() {
   }
 
  protected:
@@ -255,7 +255,7 @@ class PanelBrowserTest : public BasePanelBrowserTest {
   }
 };
 
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, CheckDockedPanelProperties) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, CheckDockedPanelProperties) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   DockedPanelStrip* docked_strip = panel_manager->docked_strip();
 
@@ -316,7 +316,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, CheckDockedPanelProperties) {
   panel_manager->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, CreatePanel) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, CreatePanel) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   EXPECT_EQ(0, panel_manager->num_panels()); // No panels initially.
 
@@ -337,7 +337,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, CreatePanel) {
   EXPECT_EQ(0, panel_manager->num_panels());
 }
 
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, CreateBigPanel) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, CreateBigPanel) {
   gfx::Rect work_area = PanelManager::GetInstance()->
       display_settings_provider()->GetDisplayArea();
   Panel* panel = CreatePanelWithBounds("BigPanel", work_area);
@@ -350,7 +350,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, CreateBigPanel) {
 }
 
 // Flaky: http://crbug.com/105445
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DISABLED_AutoResize) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, DISABLED_AutoResize) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   panel_manager->enable_auto_sizing(true);
   // Bigger space is needed by this test.
@@ -417,7 +417,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DISABLED_AutoResize) {
   panel->Close();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, ResizePanel) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, ResizePanel) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   panel_manager->enable_auto_sizing(true);
 
@@ -450,7 +450,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, ResizePanel) {
   panel->Close();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, AnimateBounds) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, AnimateBounds) {
   Panel* panel = CreatePanelWithBounds("PanelTest", gfx::Rect(0, 0, 100, 100));
   scoped_ptr<NativePanelTesting> panel_testing(
       NativePanelTesting::Create(panel->native_panel()));
@@ -472,7 +472,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, AnimateBounds) {
   panel->Close();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, RestoredBounds) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, RestoredBounds) {
   // Disable mouse watcher. We don't care about mouse movements in this test.
   PanelManager* panel_manager = PanelManager::GetInstance();
   PanelMouseWatcher* mouse_watcher = new TestPanelMouseWatcher();
@@ -533,7 +533,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, RestoredBounds) {
   panel->Close();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MinimizeRestore) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, MinimizeRestore) {
   // We'll simulate mouse movements for test.
   PanelMouseWatcher* mouse_watcher = new TestPanelMouseWatcher();
   PanelManager::GetInstance()->SetMouseWatcherForTesting(mouse_watcher);
@@ -545,7 +545,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MinimizeRestore) {
   PanelManager::GetInstance()->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MinimizeRestoreTwoPanels) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, MinimizeRestoreTwoPanels) {
   // We'll simulate mouse movements for test.
   PanelMouseWatcher* mouse_watcher = new TestPanelMouseWatcher();
   PanelManager::GetInstance()->SetMouseWatcherForTesting(mouse_watcher);
@@ -558,7 +558,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MinimizeRestoreTwoPanels) {
   PanelManager::GetInstance()->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MinimizeRestoreThreePanels) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, MinimizeRestoreThreePanels) {
   // We'll simulate mouse movements for test.
   PanelMouseWatcher* mouse_watcher = new TestPanelMouseWatcher();
   PanelManager::GetInstance()->SetMouseWatcherForTesting(mouse_watcher);
@@ -572,7 +572,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MinimizeRestoreThreePanels) {
   PanelManager::GetInstance()->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MinimizeRestoreButtonClick) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, MinimizeRestoreButtonClick) {
   // Test with three panels.
   Panel* panel1 = CreatePanel("PanelTest1");
   Panel* panel2 = CreatePanel("PanelTest2");
@@ -619,7 +619,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MinimizeRestoreButtonClick) {
   EXPECT_FALSE(panel3->IsMinimized());
 }
 
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, RestoreAllWithTitlebarClick) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, RestoreAllWithTitlebarClick) {
   // We'll simulate mouse movements for test.
   PanelMouseWatcher* mouse_watcher = new TestPanelMouseWatcher();
   PanelManager::GetInstance()->SetMouseWatcherForTesting(mouse_watcher);
@@ -792,7 +792,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, RestoreAllWithTitlebarClick) {
 #else
 #define MAYBE_ActivatePanelOrTabbedWindow ActivatePanelOrTabbedWindow
 #endif
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MAYBE_ActivatePanelOrTabbedWindow) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, MAYBE_ActivatePanelOrTabbedWindow) {
   CreatePanelParams params1("Panel1", gfx::Rect(), SHOW_AS_ACTIVE);
   Panel* panel1 = CreatePanelWithParams(params1);
   CreatePanelParams params2("Panel2", gfx::Rect(), SHOW_AS_ACTIVE);
@@ -840,7 +840,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MAYBE_ActivatePanelOrTabbedWindow) {
 #else
 #define MAYBE_ActivateDeactivateBasic DISABLED_ActivateDeactivateBasic
 #endif
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MAYBE_ActivateDeactivateBasic) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, MAYBE_ActivateDeactivateBasic) {
   // Create an active panel.
   Panel* panel = CreatePanel("PanelTest");
   scoped_ptr<NativePanelTesting> native_panel_testing(
@@ -867,7 +867,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MAYBE_ActivateDeactivateBasic) {
 #define MAYBE_ActivateDeactivateMultiple DISABLED_ActivateDeactivateMultiple
 #endif
 
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MAYBE_ActivateDeactivateMultiple) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, MAYBE_ActivateDeactivateMultiple) {
   BrowserWindow* tabbed_window = browser()->window();
 
   // Create 4 panels in the following screen layout:
@@ -922,7 +922,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MAYBE_ActivateDeactivateMultiple) {
   EXPECT_TRUE(tabbed_window->IsActive());
 }
 
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DrawAttentionBasic) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, DrawAttentionBasic) {
   CreatePanelParams params("Initially Inactive", gfx::Rect(), SHOW_AS_INACTIVE);
   Panel* panel = CreatePanelWithParams(params);
   scoped_ptr<NativePanelTesting> native_panel_testing(
@@ -959,7 +959,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DrawAttentionBasic) {
   panel->Close();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DrawAttentionWhileMinimized) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, DrawAttentionWhileMinimized) {
   // We'll simulate mouse movements for test.
   PanelMouseWatcher* mouse_watcher = new TestPanelMouseWatcher();
   PanelManager::GetInstance()->SetMouseWatcherForTesting(mouse_watcher);
@@ -1011,7 +1011,8 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DrawAttentionWhileMinimized) {
 
 // Verify that minimized state of a panel is correct after draw attention
 // is stopped when there are other minimized panels.
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, StopDrawingAttentionWhileMinimized) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest,
+                       StopDrawingAttentionWhileMinimized) {
   // We'll simulate mouse movements for test.
   PanelMouseWatcher* mouse_watcher = new TestPanelMouseWatcher();
   PanelManager::GetInstance()->SetMouseWatcherForTesting(mouse_watcher);
@@ -1078,7 +1079,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, StopDrawingAttentionWhileMinimized) {
   panel2->Close();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DrawAttentionWhenActive) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, DrawAttentionWhenActive) {
   CreatePanelParams params("Initially Active", gfx::Rect(), SHOW_AS_ACTIVE);
   Panel* panel = CreatePanelWithParams(params);
   scoped_ptr<NativePanelTesting> native_panel_testing(
@@ -1097,7 +1098,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DrawAttentionWhenActive) {
   panel->Close();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DrawAttentionResetOnActivate) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, DrawAttentionResetOnActivate) {
   // Create 2 panels so we end up with an inactive panel that can
   // be made to draw attention.
   Panel* panel = CreatePanel("test panel1");
@@ -1122,7 +1123,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DrawAttentionResetOnActivate) {
   panel2->Close();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest,
                        DrawAttentionMinimizedNotResetOnActivate) {
   // Create 2 panels so we end up with an inactive panel that can
   // be made to draw attention.
@@ -1152,7 +1153,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
   panel2->Close();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DrawAttentionResetOnClick) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, DrawAttentionResetOnClick) {
   CreatePanelParams params("Initially Inactive", gfx::Rect(), SHOW_AS_INACTIVE);
   Panel* panel = CreatePanelWithParams(params);
   scoped_ptr<NativePanelTesting> native_panel_testing(
@@ -1176,7 +1177,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DrawAttentionResetOnClick) {
   panel->Close();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest,
                        MinimizeImmediatelyAfterRestore) {
   CreatePanelParams params("Panel Test", gfx::Rect(), SHOW_AS_ACTIVE);
   Panel* panel = CreatePanelWithParams(params);
@@ -1200,7 +1201,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
   panel->Close();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, FocusLostOnMinimize) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, FocusLostOnMinimize) {
   CreatePanelParams params("Initially Active", gfx::Rect(), SHOW_AS_ACTIVE);
   Panel* panel = CreatePanelWithParams(params);
   EXPECT_EQ(Panel::EXPANDED, panel->expansion_state());
@@ -1211,7 +1212,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, FocusLostOnMinimize) {
   panel->Close();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, CreateInactiveSwitchToActive) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, CreateInactiveSwitchToActive) {
   // Compiz will not activate initially inactive window.
   if (SkipTestIfCompizWM())
     return;
@@ -1237,7 +1238,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, CreateInactiveSwitchToActive) {
 
 // When there are 2 panels and no chrome window, minimizing one panel does
 // not expand/focuses another.
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest,
                        MAYBE_MinimizeTwoPanelsWithoutTabbedWindow) {
   CreatePanelParams params("Initially Inactive", gfx::Rect(), SHOW_AS_INACTIVE);
   Panel* panel1 = CreatePanelWithParams(params);
@@ -1277,7 +1278,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
   panel2->Close();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest,
                        NonExtensionDomainPanelsCloseOnUninstall) {
   // Create a test extension.
   DictionaryValue empty_value;
@@ -1338,7 +1339,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
   panel_other->Close();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, OnBeforeUnloadOnClose) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, OnBeforeUnloadOnClose) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   EXPECT_EQ(0, panel_manager->num_panels()); // No panels initially.
 
@@ -1390,7 +1391,8 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, OnBeforeUnloadOnClose) {
 // http://crbug.com/126381 - should find a better notification to wait
 // for resize completion. Bounds animation could happen for all sorts of
 // reasons.
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DISABLED_CreateWithExistingContents) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest,
+                       DISABLED_CreateWithExistingContents) {
   PanelManager::GetInstance()->enable_auto_sizing(true);
 
   // Load contents into regular tabbed browser.
@@ -1442,7 +1444,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DISABLED_CreateWithExistingContents) {
   tabbed_browser->window()->Close();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, SizeClamping) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, SizeClamping) {
   // Using '0' sizes is equivalent of not providing sizes in API and causes
   // minimum sizes to be applied to facilitate auto-sizing.
   CreatePanelParams params("Panel", gfx::Rect(), SHOW_AS_ACTIVE);
@@ -1474,7 +1476,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, SizeClamping) {
   panel->Close();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, TightAutosizeAroundSingleLine) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, TightAutosizeAroundSingleLine) {
   PanelManager::GetInstance()->enable_auto_sizing(true);
   // Using 0 sizes triggers auto-sizing.
   CreatePanelParams params("Panel", gfx::Rect(), SHOW_AS_ACTIVE);
@@ -1504,7 +1506,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, TightAutosizeAroundSingleLine) {
   panel->Close();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest,
                        DefaultMaxSizeOnDisplaySettingsChange) {
   Panel* panel = CreatePanelWithBounds("1", gfx::Rect(0, 0, 240, 220));
 
@@ -1527,7 +1529,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
   panel->Close();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest,
                        CustomMaxSizeOnDisplaySettingsChange) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   Panel* panel = CreatePanelWithBounds("1", gfx::Rect(0, 0, 240, 220));
@@ -1565,9 +1567,9 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
   panel->Close();
 }
 
-class PanelDownloadTest : public PanelBrowserTest {
+class OldPanelDownloadTest : public OldPanelBrowserTest {
  public:
-  PanelDownloadTest() : PanelBrowserTest() { }
+  OldPanelDownloadTest() : OldPanelBrowserTest() { }
 
   // Creates a temporary directory for downloads that is auto-deleted
   // on destruction.
@@ -1583,7 +1585,7 @@ class PanelDownloadTest : public PanelBrowserTest {
 
  protected:
   void SetUpOnMainThread() OVERRIDE {
-    PanelBrowserTest::SetUpOnMainThread();
+    OldPanelBrowserTest::SetUpOnMainThread();
 
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
@@ -1643,7 +1645,7 @@ class DownloadObserver : public content::DownloadManager::Observer {
 
 // Verify that the download shelf is opened in the existing tabbed browser
 // when a download is started in a Panel.
-IN_PROC_BROWSER_TEST_F(PanelDownloadTest, Download) {
+IN_PROC_BROWSER_TEST_F(OldPanelDownloadTest, Download) {
   Profile* profile = browser()->profile();
   ASSERT_TRUE(CreateDownloadDirectory(profile));
   Browser* panel_browser = Browser::CreateWithParams(
@@ -1696,7 +1698,7 @@ IN_PROC_BROWSER_TEST_F(PanelDownloadTest, Download) {
 // Verify that a new tabbed browser is created to display a download
 // shelf when a download is started in a Panel and there is no existing
 // tabbed browser.
-IN_PROC_BROWSER_TEST_F(PanelDownloadTest, MAYBE_DownloadNoTabbedBrowser) {
+IN_PROC_BROWSER_TEST_F(OldPanelDownloadTest, MAYBE_DownloadNoTabbedBrowser) {
   Profile* profile = browser()->profile();
   ASSERT_TRUE(CreateDownloadDirectory(profile));
   Browser* panel_browser = Browser::CreateWithParams(
diff --git a/chrome/browser/ui/panels/old_panel_drag_browsertest.cc b/chrome/browser/ui/panels/old_panel_drag_browsertest.cc
index a9b551e1..cb348c2 100644
--- a/chrome/browser/ui/panels/old_panel_drag_browsertest.cc
+++ b/chrome/browser/ui/panels/old_panel_drag_browsertest.cc
@@ -3,7 +3,7 @@
 // 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"
@@ -12,16 +12,16 @@
 #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.
@@ -81,7 +81,7 @@ class PanelDragBrowserTest : public BasePanelBrowserTest {
   }
 };
 
-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.
 
@@ -173,7 +173,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragOneDockedPanel) {
   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));
@@ -269,7 +269,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragTwoDockedPanels) {
   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));
@@ -402,7 +402,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragThreeDockedPanels) {
   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);
@@ -444,7 +444,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragMinimizedPanel) {
   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();
@@ -492,7 +492,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest,
   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();
@@ -656,7 +656,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, CloseDockedPanelOnDrag) {
   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
@@ -702,7 +702,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragOneDetachedPanel) {
   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();
@@ -841,7 +841,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, CloseDetachedPanelOnDrag) {
   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();
@@ -896,7 +896,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, Detach) {
   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();
@@ -951,7 +951,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DetachAndCancel) {
   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();
@@ -1010,7 +1010,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, Attach) {
   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();
@@ -1065,7 +1065,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, AttachAndCancel) {
   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();
@@ -1126,7 +1126,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DetachAttachAndCancel) {
   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();
@@ -1207,7 +1207,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DetachWithSqueeze) {
   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();
@@ -1315,7 +1315,7 @@ IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, AttachWithSqueeze) {
   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);
diff --git a/chrome/browser/ui/panels/old_panel_resize_browsertest.cc b/chrome/browser/ui/panels/old_panel_resize_browsertest.cc
index 7ca7ea3..1f1cb49 100644
--- a/chrome/browser/ui/panels/old_panel_resize_browsertest.cc
+++ b/chrome/browser/ui/panels/old_panel_resize_browsertest.cc
@@ -2,22 +2,22 @@
 // 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/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/panel.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/panel_resize_controller.h"
 
-class PanelResizeBrowserTest : public BasePanelBrowserTest {
+class OldPanelResizeBrowserTest : public OldBasePanelBrowserTest {
  public:
-  PanelResizeBrowserTest() : BasePanelBrowserTest() {
+  OldPanelResizeBrowserTest() : OldBasePanelBrowserTest() {
   }
 
-  virtual ~PanelResizeBrowserTest() {
+  virtual ~OldPanelResizeBrowserTest() {
   }
 
   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.
@@ -28,7 +28,7 @@ class PanelResizeBrowserTest : public BasePanelBrowserTest {
   }
 };
 
-IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, DockedPanelResizability) {
+IN_PROC_BROWSER_TEST_F(OldPanelResizeBrowserTest, DockedPanelResizability) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   Panel* panel = CreatePanel("Panel");
 
@@ -147,7 +147,7 @@ IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, DockedPanelResizability) {
   panel->Close();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, ResizeDetachedPanel) {
+IN_PROC_BROWSER_TEST_F(OldPanelResizeBrowserTest, ResizeDetachedPanel) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   Panel* panel = CreateDetachedPanel("Panel", gfx::Rect(300, 200, 150, 100));
 
@@ -214,7 +214,8 @@ IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, ResizeDetachedPanel) {
   PanelManager::GetInstance()->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, ResizeDetachedPanelToClampSize) {
+IN_PROC_BROWSER_TEST_F(OldPanelResizeBrowserTest,
+                       ResizeDetachedPanelToClampSize) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   Panel* panel = CreateDetachedPanel("Panel", gfx::Rect(300, 200, 150, 100));
 
@@ -259,7 +260,8 @@ IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, ResizeDetachedPanelToClampSize) {
   PanelManager::GetInstance()->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, CloseDetachedPanelOnResize) {
+IN_PROC_BROWSER_TEST_F(OldPanelResizeBrowserTest,
+                       CloseDetachedPanelOnResize) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   PanelResizeController* resize_controller = panel_manager->resize_controller();
   DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
@@ -321,7 +323,7 @@ IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, CloseDetachedPanelOnResize) {
   panel_manager->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, ResizeAndCancel) {
+IN_PROC_BROWSER_TEST_F(OldPanelResizeBrowserTest, ResizeAndCancel) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   Panel* panel = CreateDetachedPanel("Panel", gfx::Rect(300, 200, 150, 100));
   PanelResizeController* resize_controller = panel_manager->resize_controller();
@@ -367,7 +369,7 @@ IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, ResizeAndCancel) {
   panel_manager->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelResizeBrowserTest, ResizeDetachedPanelToTop) {
+IN_PROC_BROWSER_TEST_F(OldPanelResizeBrowserTest, 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);
diff --git a/chrome/browser/ui/panels/panel.h b/chrome/browser/ui/panels/panel.h
index 0516a06..fa11d37 100644
--- a/chrome/browser/ui/panels/panel.h
+++ b/chrome/browser/ui/panels/panel.h
@@ -283,6 +283,7 @@ class Panel : public BaseWindow,
  private:
   friend class PanelManager;
   friend class PanelBrowserTest;
+  friend class OldPanelBrowserTest;
 
   enum MaxSizePolicy {
     // Default maximum size is proportional to the work area.
diff --git a/chrome/browser/ui/panels/panel_browser_window.h b/chrome/browser/ui/panels/panel_browser_window.h
index 9c9126d..59ec377 100644
--- a/chrome/browser/ui/panels/panel_browser_window.h
+++ b/chrome/browser/ui/panels/panel_browser_window.h
@@ -160,6 +160,7 @@ class PanelBrowserWindow : public BrowserWindow,
 
  private:
   friend class BasePanelBrowserTest;
+  friend class OldBasePanelBrowserTest;
   friend class PanelBrowserWindowCocoaTest;
   Panel* panel() const { return panel_; }  // only for tests
 
diff --git a/chrome/browser/ui/panels/panel_mouse_watcher.h b/chrome/browser/ui/panels/panel_mouse_watcher.h
index 951b764..6fcedf2 100644
--- a/chrome/browser/ui/panels/panel_mouse_watcher.h
+++ b/chrome/browser/ui/panels/panel_mouse_watcher.h
@@ -46,7 +46,7 @@ class PanelMouseWatcher {
   friend class PanelMouseWatcherTest;
   FRIEND_TEST_ALL_PREFIXES(PanelMouseWatcherTest, StartStopWatching);
   friend class BasePanelBrowserTest;
-  FRIEND_TEST_ALL_PREFIXES(PanelOverflowBrowserTest, FullScreenMode);
+  friend class OldBasePanelBrowserTest;
 
   // Start/stop tracking mouse movements.
   virtual void Start() = 0;
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index b98ade2..f94f164 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -175,6 +175,8 @@
         'browser/ui/fullscreen_controller_test.h',
         'browser/ui/panels/base_panel_browser_test.cc',
         'browser/ui/panels/base_panel_browser_test.h',
+        'browser/ui/panels/old_base_panel_browser_test.cc',
+        'browser/ui/panels/old_base_panel_browser_test.h',
         'browser/ui/panels/test_panel_mouse_watcher.cc',
         'browser/ui/panels/test_panel_mouse_watcher.h',
         'browser/ui/tab_contents/test_tab_contents.cc',
@@ -493,6 +495,12 @@
         'browser/ui/panels/panel_browsertest.cc',
         'browser/ui/panels/panel_drag_browsertest.cc',
         'browser/ui/panels/panel_resize_browsertest.cc',
+        'browser/ui/panels/old_detached_panel_browsertest.cc',
+        'browser/ui/panels/old_docked_panel_browsertest.cc',
+        'browser/ui/panels/old_panel_and_desktop_notification_browsertest.cc',
+        'browser/ui/panels/old_panel_browsertest.cc',
+        'browser/ui/panels/old_panel_drag_browsertest.cc',
+        'browser/ui/panels/old_panel_resize_browsertest.cc',
         'browser/ui/views/bookmarks/bookmark_bar_view_test.cc',
         'browser/ui/views/button_dropdown_test.cc',
         'browser/ui/views/find_bar_host_interactive_uitest.cc',
@@ -586,6 +594,12 @@
             'browser/ui/panels/panel_browsertest.cc',
             'browser/ui/panels/panel_drag_browsertest.cc',
             'browser/ui/panels/panel_resize_browsertest.cc',
+            'browser/ui/panels/old_detached_panel_browsertest.cc',
+            'browser/ui/panels/old_docked_panel_browsertest.cc',
+            'browser/ui/panels/old_panel_and_desktop_notification_browsertest.cc',
+            'browser/ui/panels/old_panel_browsertest.cc',
+            'browser/ui/panels/old_panel_drag_browsertest.cc',
+            'browser/ui/panels/old_panel_resize_browsertest.cc',
           ],
         }],
         ['OS=="win"', {