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

chrome/browser/ui/panels/old_base_panel_browser_test.h

 // 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.
 
-#ifndef CHROME_BROWSER_UI_PANELS_OLD_BASE_PANEL_BROWSER_TEST_H_
-#define CHROME_BROWSER_UI_PANELS_OLD_BASE_PANEL_BROWSER_TEST_H_
+#ifndef CHROME_BROWSER_UI_PANELS_BASE_PANEL_BROWSER_TEST_H_
+#define CHROME_BROWSER_UI_PANELS_BASE_PANEL_BROWSER_TEST_H_
 #pragma once
 
 #include "base/values.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/ui/panels/display_settings_provider.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_strip.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "ui/gfx/rect.h"
 
-class OldBasePanelBrowserTest : public InProcessBrowserTest {
+class BasePanelBrowserTest : public InProcessBrowserTest {
  public:
   class MockDisplaySettingsProvider : public DisplaySettingsProvider {
    public:
     MockDisplaySettingsProvider() { }
     virtual ~MockDisplaySettingsProvider() { }
 
     virtual void SetPrimaryScreenArea(const gfx::Rect& primary_screen_area) = 0;
     virtual void SetWorkArea(const gfx::Rect& work_area) = 0;
     virtual void EnableAutoHidingDesktopBar(DesktopBarAlignment alignment,
                                             bool enabled,
                                             int thickness) = 0;
     virtual void SetDesktopBarVisibility(DesktopBarAlignment alignment,
                                          DesktopBarVisibility visibility) = 0;
     virtual void SetDesktopBarThickness(DesktopBarAlignment alignment,
                                         int thickness) = 0;
   };
 
-  OldBasePanelBrowserTest();
-  virtual ~OldBasePanelBrowserTest();
+  BasePanelBrowserTest();
+  virtual ~BasePanelBrowserTest();
 
   // Linux bots use icewm which activate windows in ways that break
   // certain panel tests. Skip those tests when running on the bots.
   // We do not disable the tests to make it easy for developers to run
   // them locally.
   bool SkipTestIfIceWM();
 
   // Gnome running compiz refuses to activate a window that was initially
   // created as inactive, causing certain panel tests to fail. These tests
   // pass fine on the bots, but fail for developers as Gnome running compiz
@@ skipping 69 matching lines @@
 
   static const FilePath::CharType* kTestDir;
 
  private:
   // Passed to and owned by PanelManager.
   MockDisplaySettingsProvider* mock_display_settings_provider_;
 
   bool mock_display_settings_enabled_;
 };
 
-#endif  // CHROME_BROWSER_UI_PANELS_OLD_BASE_PANEL_BROWSER_TEST_H_
+#endif  // CHROME_BROWSER_UI_PANELS_BASE_PANEL_BROWSER_TEST_H_