Remove unused items in the ash tray for Windows.

ash/wm/panels/panel_window_resizer_unittest.cc

 // Copyright (c) 2013 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 "ash/wm/panels/panel_window_resizer.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
@@ skipping 38 matching lines @@
  protected:
   gfx::Point CalculateDragPoint(const WindowResizer& resizer,
                                 int delta_x,
                                 int delta_y) const {
     gfx::Point location = resizer.GetInitialLocation();
     location.set_x(location.x() + delta_x);
     location.set_y(location.y() + delta_y);
     return location;
   }
 
-  aura::Window* CreatePanelWindow(const gfx::Rect& bounds) {
+  aura::Window* CreatePanelWindow(const gfx::Point& origin) {
+    gfx::Rect bounds(origin, gfx::Size(101, 101));
     aura::Window* window = CreateTestWindowInShellWithDelegateAndType(
         NULL,
         aura::client::WINDOW_TYPE_PANEL,
         0,
         bounds);
     launcher_delegate_->AddLauncherItem(window);
     PanelLayoutManager* manager =
         static_cast<PanelLayoutManager*>(
             Shell::GetContainer(window->GetRootWindow(),
                                 internal::kShellWindowId_PanelContainer)->
@@ skipping 74 matching lines @@
          window_order.begin(); iter != window_order.end();
          ++iter, ++panel_index) {
       LauncherID id = launcher_delegate_->GetIDByWindow(*iter);
       EXPECT_EQ(id, model_->items()[panel_index].id);
     }
   }
 
   // Test dragging panel window along the shelf and verify that panel icons
   // are reordered appropriately.
   void DragAlongShelfReorder(int dx, int dy) {
-    gfx::Rect bounds(0, 0, 201, 201);
-    scoped_ptr<aura::Window> w1(CreatePanelWindow(bounds));
-    scoped_ptr<aura::Window> w2(CreatePanelWindow(bounds));
+    gfx::Point origin(0, 0);
+    scoped_ptr<aura::Window> w1(CreatePanelWindow(origin));
+    scoped_ptr<aura::Window> w2(CreatePanelWindow(origin));
     std::vector<aura::Window*> window_order_original;
     std::vector<aura::Window*> window_order_swapped;
     window_order_original.push_back(w1.get());
     window_order_original.push_back(w2.get());
     window_order_swapped.push_back(w2.get());
     window_order_swapped.push_back(w1.get());
     TestWindowOrder(window_order_original);
 
     // Drag window #2 to the beginning of the shelf.
     DragStart(w2.get());
@@ skipping 51 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(PanelWindowResizerTextDirectionTest);
 };
 
 // Verifies a window can be dragged from the panel and detached and then
 // reattached.
 TEST_F(PanelWindowResizerTest, PanelDetachReattachBottom) {
  if (!SupportsHostWindowResize())
     return;
 
   scoped_ptr<aura::Window> window(
-      CreatePanelWindow(gfx::Rect(0, 0, 201, 201)));
+      CreatePanelWindow(gfx::Point(0, 0)));
   DetachReattachTest(window.get(), 0, -1);
 }
 
 TEST_F(PanelWindowResizerTest, PanelDetachReattachLeft) {
  if (!SupportsHostWindowResize())
     return;
 
   ash::Shell* shell = ash::Shell::GetInstance();
   shell->SetShelfAlignment(SHELF_ALIGNMENT_LEFT, shell->GetPrimaryRootWindow());
   scoped_ptr<aura::Window> window(
-      CreatePanelWindow(gfx::Rect(0, 0, 201, 201)));
+      CreatePanelWindow(gfx::Point(0, 0)));
   DetachReattachTest(window.get(), 1, 0);
 }
 
 TEST_F(PanelWindowResizerTest, PanelDetachReattachRight) {
   if (!SupportsHostWindowResize())
     return;
 
   ash::Shell* shell = ash::Shell::GetInstance();
   shell->SetShelfAlignment(SHELF_ALIGNMENT_RIGHT,
                            shell->GetPrimaryRootWindow());
   scoped_ptr<aura::Window> window(
-      CreatePanelWindow(gfx::Rect(0, 0, 201, 201)));
+      CreatePanelWindow(gfx::Point(0, 0)));
   DetachReattachTest(window.get(), -1, 0);
 }
 
 TEST_F(PanelWindowResizerTest, PanelDetachReattachTop) {
  if (!SupportsHostWindowResize())
     return;
 
   ash::Shell* shell = ash::Shell::GetInstance();
   shell->SetShelfAlignment(SHELF_ALIGNMENT_TOP, shell->GetPrimaryRootWindow());
   scoped_ptr<aura::Window> window(
-      CreatePanelWindow(gfx::Rect(0, 0, 201, 201)));
+      CreatePanelWindow(gfx::Point(0, 0)));
   DetachReattachTest(window.get(), 0, 1);
 }
 
 TEST_F(PanelWindowResizerTest, PanelDetachReattachMultipleDisplays) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("600x400,600x400");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   scoped_ptr<aura::Window> window(
-      CreatePanelWindow(gfx::Rect(600, 0, 201, 201)));
+      CreatePanelWindow(gfx::Point(600, 0)));
   EXPECT_EQ(root_windows[1], window->GetRootWindow());
   DetachReattachTest(window.get(), 0, -1);
 }
 
 TEST_F(PanelWindowResizerTest, DetachThenDragAcrossDisplays) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("600x400,600x400");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   scoped_ptr<aura::Window> window(
-      CreatePanelWindow(gfx::Rect(0, 0, 201, 201)));
+      CreatePanelWindow(gfx::Point(0, 0)));
   gfx::Rect initial_bounds = window->GetBoundsInScreen();
   EXPECT_EQ(root_windows[0], window->GetRootWindow());
   DragStart(window.get());
   DragMove(0, -100);
   DragEnd();
   EXPECT_EQ(root_windows[0], window->GetRootWindow());
   EXPECT_EQ(initial_bounds.x(), window->GetBoundsInScreen().x());
   EXPECT_EQ(initial_bounds.y() - 100, window->GetBoundsInScreen().y());
   EXPECT_FALSE(wm::GetWindowState(window.get())->panel_attached());
   EXPECT_EQ(internal::kShellWindowId_DefaultContainer,
@@ skipping 10 matching lines @@
             window->parent()->id());
 }
 
 TEST_F(PanelWindowResizerTest, DetachAcrossDisplays) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("600x400,600x400");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   scoped_ptr<aura::Window> window(
-      CreatePanelWindow(gfx::Rect(0, 0, 201, 201)));
+      CreatePanelWindow(gfx::Point(0, 0)));
   gfx::Rect initial_bounds = window->GetBoundsInScreen();
   EXPECT_EQ(root_windows[0], window->GetRootWindow());
   DragStart(window.get());
   DragMove(500, -100);
   DragEnd();
   EXPECT_EQ(root_windows[1], window->GetRootWindow());
   EXPECT_EQ(initial_bounds.x() + 500, window->GetBoundsInScreen().x());
   EXPECT_EQ(initial_bounds.y() - 100, window->GetBoundsInScreen().y());
   EXPECT_FALSE(wm::GetWindowState(window.get())->panel_attached());
   EXPECT_EQ(internal::kShellWindowId_DefaultContainer,
             window->parent()->id());
 }
 
 TEST_F(PanelWindowResizerTest, DetachThenAttachToSecondDisplay) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("600x400,600x600");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   scoped_ptr<aura::Window> window(
-      CreatePanelWindow(gfx::Rect(0, 0, 201, 201)));
+      CreatePanelWindow(gfx::Point(0, 0)));
   gfx::Rect initial_bounds = window->GetBoundsInScreen();
   EXPECT_EQ(root_windows[0], window->GetRootWindow());
 
   // Detach the window.
   DragStart(window.get());
   DragMove(0, -100);
   DragEnd();
   EXPECT_EQ(root_windows[0], window->GetRootWindow());
   EXPECT_FALSE(wm::GetWindowState(window.get())->panel_attached());
 
@@ skipping 12 matching lines @@
   EXPECT_EQ(internal::kShellWindowId_PanelContainer, window->parent()->id());
 }
 
 TEST_F(PanelWindowResizerTest, AttachToSecondDisplay) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("600x400,600x600");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   scoped_ptr<aura::Window> window(
-      CreatePanelWindow(gfx::Rect(0, 0, 201, 201)));
+      CreatePanelWindow(gfx::Point(0, 0)));
   gfx::Rect initial_bounds = window->GetBoundsInScreen();
   EXPECT_EQ(root_windows[0], window->GetRootWindow());
 
   // Drag the window just above the other display's launcher.
   DragStart(window.get());
   DragMove(500, 195);
   EXPECT_EQ(initial_bounds.x() + 500, window->GetBoundsInScreen().x());
 
   // Should stick to other launcher.
   EXPECT_EQ(initial_bounds.y() + 200, window->GetBoundsInScreen().y());
   DragEnd();
 
   // When dropped should move to second display's panel container.
   EXPECT_EQ(root_windows[1], window->GetRootWindow());
   EXPECT_TRUE(wm::GetWindowState(window.get())->panel_attached());
   EXPECT_EQ(internal::kShellWindowId_PanelContainer, window->parent()->id());
 }
 
 TEST_F(PanelWindowResizerTest, RevertDragRestoresAttachment) {
   scoped_ptr<aura::Window> window(
-      CreatePanelWindow(gfx::Rect(0, 0, 201, 201)));
+      CreatePanelWindow(gfx::Point(0, 0)));
   EXPECT_TRUE(wm::GetWindowState(window.get())->panel_attached());
   EXPECT_EQ(internal::kShellWindowId_PanelContainer, window->parent()->id());
   DragStart(window.get());
   DragMove(0, -100);
   DragRevert();
   EXPECT_TRUE(wm::GetWindowState(window.get())->panel_attached());
   EXPECT_EQ(internal::kShellWindowId_PanelContainer, window->parent()->id());
 
   // Detach panel.
   DragStart(window.get());
   DragMove(0, -100);
   DragEnd();
   EXPECT_FALSE(wm::GetWindowState(window.get())->panel_attached());
   EXPECT_EQ(internal::kShellWindowId_DefaultContainer,
             window->parent()->id());
 
   // Drag back to launcher.
   DragStart(window.get());
   DragMove(0, 100);
 
   // When the drag is reverted it should remain detached.
   DragRevert();
   EXPECT_FALSE(wm::GetWindowState(window.get())->panel_attached());
   EXPECT_EQ(internal::kShellWindowId_DefaultContainer,
             window->parent()->id());
 }
 
 TEST_F(PanelWindowResizerTest, DragMovesToPanelLayer) {
-  scoped_ptr<aura::Window> window(CreatePanelWindow(gfx::Rect(0, 0, 201, 201)));
+  scoped_ptr<aura::Window> window(CreatePanelWindow(gfx::Point(0, 0)));
   DragStart(window.get());
   DragMove(0, -100);
   DragEnd();
   EXPECT_EQ(internal::kShellWindowId_DefaultContainer,
             window->parent()->id());
 
   // While moving the panel window should be moved to the panel container.
   DragStart(window.get());
   DragMove(20, 0);
   EXPECT_EQ(internal::kShellWindowId_PanelContainer, window->parent()->id());
@@ skipping 18 matching lines @@
   ash::Shell* shell = ash::Shell::GetInstance();
   shell->SetShelfAlignment(SHELF_ALIGNMENT_LEFT, shell->GetPrimaryRootWindow());
   DragAlongShelfReorder(0, -1);
 }
 
 INSTANTIATE_TEST_CASE_P(LtrRtl, PanelWindowResizerTextDirectionTest,
                         testing::Bool());
 
 }  // namespace internal
 }  // namespace ash