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

chrome/browser/ui/panels/old_panel_and_desktop_notification_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/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/notifications/balloon_collection_impl.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/notification.h"
 #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/old_base_panel_browser_test.h"
+#include "chrome/browser/ui/panels/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"
 #include "chrome/common/pref_names.h"
 #include "content/public/common/show_desktop_notification_params.h"
 #include "ui/gfx/screen.h"
 
 // Desktop notification code subscribes to various panel change notifications
 // so that it knows when to adjusts balloon positions. In order to give
 // desktop notification code a chance to process the change notifications,
 // we call MessageLoopForUI::current()->RunAllPending() after any panel change
 // has been made.
-class OldPanelAndDesktopNotificationTest : public OldBasePanelBrowserTest {
+class PanelAndDesktopNotificationTest : public BasePanelBrowserTest {
  public:
-  OldPanelAndDesktopNotificationTest() : OldBasePanelBrowserTest() {
+  PanelAndDesktopNotificationTest() : BasePanelBrowserTest() {
   }
 
-  virtual ~OldPanelAndDesktopNotificationTest() {
+  virtual ~PanelAndDesktopNotificationTest() {
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
     // Do not use our own testing work area since desktop notification code
     // does not have the hook up for testing work area.
     disable_display_settings_mock();
 
-    OldBasePanelBrowserTest::SetUpOnMainThread();
+    BasePanelBrowserTest::SetUpOnMainThread();
 
     g_browser_process->local_state()->SetInteger(
         prefs::kDesktopNotificationPosition, BalloonCollection::LOWER_RIGHT);
     balloons_ = new BalloonCollectionImpl();
     ui_manager_.reset(NotificationUIManager::Create(
         g_browser_process->local_state(), balloons_));
     service_.reset(new DesktopNotificationService(browser()->profile(),
                    ui_manager_.get()));
   }
 
   virtual void CleanUpOnMainThread() OVERRIDE {
     balloons_->RemoveAll();
     MessageLoopForUI::current()->RunAllPending();
 
     service_.reset();
     ui_manager_.reset();
 
-    OldBasePanelBrowserTest::CleanUpOnMainThread();
+    BasePanelBrowserTest::CleanUpOnMainThread();
   }
 
   content::ShowDesktopNotificationHostMsgParams StandardTestNotification() {
     content::ShowDesktopNotificationHostMsgParams params;
     params.notification_id = 0;
     params.origin = GURL("http://www.google.com");
     params.is_html = false;
     params.icon_url = GURL("/icon.png");
     params.title = ASCIIToUTF16("Title");
     params.body = ASCIIToUTF16("Text");
@@ skipping 44 matching lines @@
   const BalloonCollection::Balloons& balloons() const {
     return balloons_->GetActiveBalloons();
   }
 
  private:
   BalloonCollectionImpl* balloons_;  // Owned by NotificationUIManager.
   scoped_ptr<NotificationUIManager> ui_manager_;
   scoped_ptr<DesktopNotificationService> service_;
 };
 
-IN_PROC_BROWSER_TEST_F(OldPanelAndDesktopNotificationTest, AddAndClosePanel) {
+IN_PROC_BROWSER_TEST_F(PanelAndDesktopNotificationTest, AddAndClosePanel) {
   Balloon* balloon = CreateBalloon();
   int original_balloon_bottom = GetBalloonBottomPosition(balloon);
 
   // Create a docked panel. Expect that the notification balloon moves up to be
   // above the panel.
   Panel* panel = CreateDockedPanel("1", gfx::Rect(0, 0, 200, 200));
   MessageLoopForUI::current()->RunAllPending();
   int balloon_bottom = GetBalloonBottomPosition(balloon);
   EXPECT_LT(balloon_bottom, panel->GetBounds().y());
   EXPECT_LT(balloon_bottom, original_balloon_bottom);
 
   // Close the panel. Expect the notification balloon moves back to its original
   // position.
   panel->Close();
   MessageLoopForUI::current()->RunAllPending();
   EXPECT_EQ(original_balloon_bottom, GetBalloonBottomPosition(balloon));
 }
 
-IN_PROC_BROWSER_TEST_F(OldPanelAndDesktopNotificationTest,
+IN_PROC_BROWSER_TEST_F(PanelAndDesktopNotificationTest,
                        ExpandAndCollapsePanel) {
   // Disable mouse watcher since we don't want mouse movements to affect panel
   // testing for title-only state.
   PanelManager* panel_manager = PanelManager::GetInstance();
   PanelMouseWatcher* mouse_watcher = new TestPanelMouseWatcher();
   panel_manager->SetMouseWatcherForTesting(mouse_watcher);
 
   Balloon* balloon = CreateBalloon();
 
   // Create a docked panel. Expect that the notification balloon moves up to be
@@ skipping 23 matching lines @@
 
   // Expand the panel. Expect that the notification balloon moves up to go back
   // to the same position when the panel is expanded.
   panel->Restore();
   MessageLoopForUI::current()->RunAllPending();
   EXPECT_EQ(balloon_bottom_on_expanded, GetBalloonBottomPosition(balloon));
 
   PanelManager::GetInstance()->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(OldPanelAndDesktopNotificationTest, DragNarrowPanel) {
+IN_PROC_BROWSER_TEST_F(PanelAndDesktopNotificationTest, DragNarrowPanel) {
   Balloon* balloon = CreateBalloon();
 
   // Let the panel width be smaller than the balloon width.
   int panel_width = balloon->GetViewSize().width() - 50;
 
   // Create 2 docked panels. Expect that the notification balloon moves up to be
   // above the tall panel.
   Panel* tall_panel = CreateDockedPanel("1", gfx::Rect(0, 0, panel_width, 300));
   Panel* short_panel = CreateDockedPanel(
       "2", gfx::Rect(0, 0, panel_width, 200));
   MessageLoopForUI::current()->RunAllPending();
   int balloon_bottom = GetBalloonBottomPosition(balloon);
   EXPECT_LT(balloon_bottom, tall_panel->GetBounds().y());
 
   // Swap 2 docked panels by dragging. Expect that the notificaition balloon
   // remains at the same position.
   DragPanelToMouseLocation(tall_panel, short_panel->GetBounds().origin());
   MessageLoopForUI::current()->RunAllPending();
   EXPECT_EQ(balloon_bottom, GetBalloonBottomPosition(balloon));
 
   PanelManager::GetInstance()->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(OldPanelAndDesktopNotificationTest, DragWidePanel) {
+IN_PROC_BROWSER_TEST_F(PanelAndDesktopNotificationTest, DragWidePanel) {
   Balloon* balloon = CreateBalloon();
 
   // Let the panel width be greater than the balloon width.
   int panel_width = balloon->GetViewSize().width() + 50;
 
   // Create 2 docked panels. Expect that the notification balloon moves up to be
   // above the tall panel.
   Panel* tall_panel = CreateDockedPanel("1", gfx::Rect(0, 0, panel_width, 300));
   Panel* short_panel = CreateDockedPanel(
       "2", gfx::Rect(0, 0, panel_width, 200));
   MessageLoopForUI::current()->RunAllPending();
   int balloon_bottom_before_drag = GetBalloonBottomPosition(balloon);
   EXPECT_LT(balloon_bottom_before_drag, tall_panel->GetBounds().y());
 
   // Swap 2 docked panels by dragging. Expect that the notificaiton balloon
   // moves down to be just above the short panel.
   DragPanelToMouseLocation(tall_panel, short_panel->GetBounds().origin());
   MessageLoopForUI::current()->RunAllPending();
   int balloon_bottom_after_drag = GetBalloonBottomPosition(balloon);
   EXPECT_LT(balloon_bottom_after_drag, short_panel->GetBounds().y());
   EXPECT_LT(balloon_bottom_before_drag, balloon_bottom_after_drag);
 
   PanelManager::GetInstance()->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(OldPanelAndDesktopNotificationTest,
-                       DetachAndAttachPanel) {
+IN_PROC_BROWSER_TEST_F(PanelAndDesktopNotificationTest, DetachAndAttachPanel) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   Balloon* balloon = CreateBalloon();
   int original_balloon_bottom = GetBalloonBottomPosition(balloon);
 
   // Create a docked panel. Expect that the notification balloon moves up to be
   // above the panel.
   Panel* panel = CreateDockedPanel("1", gfx::Rect(0, 0, 200, 200));
   MessageLoopForUI::current()->RunAllPending();
   int balloon_bottom_after_panel_created = GetBalloonBottomPosition(balloon);
   EXPECT_LT(balloon_bottom_after_panel_created, panel->GetBounds().y());
@@ skipping 12 matching lines @@
   panel_manager->MovePanelToStrip(
       panel, PanelStrip::DOCKED, PanelStrip::DEFAULT_POSITION);
   MessageLoopForUI::current()->RunAllPending();
   EXPECT_EQ(PanelStrip::DOCKED, panel->panel_strip()->type());
   EXPECT_EQ(balloon_bottom_after_panel_created,
             GetBalloonBottomPosition(balloon));
 
   panel_manager->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(OldPanelAndDesktopNotificationTest, ResizePanel) {
+IN_PROC_BROWSER_TEST_F(PanelAndDesktopNotificationTest, ResizePanel) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   Balloon* balloon = CreateBalloon();
 
   // Create a docked panel. Expect that the notification balloon moves up to be
   // above the panel.
   Panel* panel = CreateDockedPanel("1", gfx::Rect(0, 0, 200, 200));
   MessageLoopForUI::current()->RunAllPending();
   int balloon_bottom = GetBalloonBottomPosition(balloon);
   gfx::Rect original_bounds = panel->GetBounds();
   EXPECT_LT(balloon_bottom, original_bounds.y());
@@ skipping 15 matching lines @@
   new_bounds.set_width(new_bounds.width() + resize_delta.x());
   new_bounds.set_height(new_bounds.height() + resize_delta.y());
   panel->SetBounds(new_bounds);
   MessageLoopForUI::current()->RunAllPending();
   int balloon_bottom3 = GetBalloonBottomPosition(balloon);
   EXPECT_EQ(balloon_bottom2 - resize_delta.y(), balloon_bottom3);
 
   panel_manager->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(OldPanelAndDesktopNotificationTest, ResizePanelByMouse) {
+IN_PROC_BROWSER_TEST_F(PanelAndDesktopNotificationTest, ResizePanelByMouse) {
   Balloon* balloon = CreateBalloon();
 
   // Create a docked panel. Expect that the notification balloon moves up to be
   // above the panel.
   Panel* panel = CreateDockedPanel("1", gfx::Rect(0, 0, 200, 200));
   MessageLoopForUI::current()->RunAllPending();
   int balloon_bottom = GetBalloonBottomPosition(balloon);
   EXPECT_LT(balloon_bottom, panel->GetBounds().y());
 
   // Resize the panel to make it taller. Expect that the notification balloon
   // moves further up by the amount of enlarge offset.
   gfx::Point drag_delta(-50, -100);
   ResizePanelByMouseWithDelta(panel, panel::RESIZE_TOP_LEFT, drag_delta);
   MessageLoopForUI::current()->RunAllPending();
   int balloon_bottom2 = GetBalloonBottomPosition(balloon);
   EXPECT_EQ(balloon_bottom + drag_delta.y(), balloon_bottom2);
 
   // Resize the panel to make it shorter. Expect that the notification balloon
   // moves down by the amount of shrink offset.
   drag_delta = gfx::Point(0, 60);
   ResizePanelByMouseWithDelta(panel, panel::RESIZE_TOP, drag_delta);
   MessageLoopForUI::current()->RunAllPending();
   int balloon_bottom3 = GetBalloonBottomPosition(balloon);
   EXPECT_EQ(balloon_bottom2 + drag_delta.y(), balloon_bottom3);
 
   PanelManager::GetInstance()->CloseAll();
 }
 
-IN_PROC_BROWSER_TEST_F(OldPanelAndDesktopNotificationTest,
-                       InteractWithTwoPanels) {
+IN_PROC_BROWSER_TEST_F(PanelAndDesktopNotificationTest, InteractWithTwoPanels) {
   Balloon* balloon = CreateBalloon();
   int original_balloon_bottom = GetBalloonBottomPosition(balloon);
 
   // Let the panel width be smaller than the balloon width.
   int panel_width = balloon->GetViewSize().width() - 50;
 
   // Create a short panel. Expect that the notification balloon moves up to be
   // above the short panel.
   Panel* short_panel = CreateDockedPanel(
       "1", gfx::Rect(0, 0, panel_width, 150));
@@ skipping 54 matching lines @@
   MessageLoopForUI::current()->RunAllPending();
   EXPECT_EQ(balloon_bottom_after_short_panel_created,
             GetBalloonBottomPosition(balloon));
 
   // Close short panel. Expect that the notification balloo moves back to its
   // original position.
   short_panel->Close();
   MessageLoopForUI::current()->RunAllPending();
   EXPECT_EQ(original_balloon_bottom, GetBalloonBottomPosition(balloon));
 }