Fix app list duplication on drag.

ui/app_list/views/app_list_main_view_unittest.cc

 // Copyright 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 "ui/app_list/views/app_list_main_view.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
@@ skipping 246 matching lines @@
 
   EXPECT_EQ(1, FolderViewModel()->view_size());
 
   AppListItemView* dragged = StartDragForReparent(0);
 
   // Drop it to the slot on the right of first slot.
   gfx::Rect drop_target_tile(first_slot_tile);
   drop_target_tile.Offset(first_slot_tile.width() * 2, 0);
   gfx::Point point = drop_target_tile.CenterPoint();
   SimulateUpdateDrag(FolderGridView(), AppsGridView::MOUSE, dragged, point);
-  SimulateUpdateDrag(FolderGridView(), AppsGridView::MOUSE, dragged, point);
-  base::RunLoop().RunUntilIdle();
 
   // Drop it.
   FolderGridView()->EndDrag(false);
-  base::RunLoop().RunUntilIdle();
 
   // Folder icon view should be gone and there is only one item view.
   EXPECT_EQ(1, RootViewModel()->view_size());
   EXPECT_EQ(AppListItemView::kViewClassName,
             RootViewModel()->view_at(0)->GetClassName());
 
   // The item view should be in slot 1 instead of slot 2 where it is dropped.
   AppsGridViewTestApi root_grid_view_test_api(RootGridView());
   root_grid_view_test_api.LayoutToIdealBounds();
   EXPECT_EQ(first_slot_tile, RootViewModel()->view_at(0)->bounds());
 
   // Single item folder should be auto removed.
   EXPECT_EQ(NULL,
             delegate_->GetTestModel()->FindFolderItem("single_item_folder"));
 }
 
+// Tests dragging an item out of a single item folder and dropping it onto the
+// page switcher. Regression test for http://crbug.com/415530/.
+TEST_F(AppListMainViewTest, DragReparentItemOntoPageSwitcher) {
+  AppListItemView* folder_item_view = CreateAndOpenSingleItemFolder();
+  const gfx::Rect first_slot_tile = folder_item_view->bounds();
+
+  delegate_->GetTestModel()->PopulateApps(20);
+
+  EXPECT_EQ(1, FolderViewModel()->view_size());
+  EXPECT_EQ(21, RootViewModel()->view_size());
+
+  AppListItemView* dragged = StartDragForReparent(0);
+
+  gfx::Rect main_view_bounds = main_view_->bounds();
+  // Drag the reparent item to the page switcher.
+  gfx::Point point =
+      gfx::Point(main_view_bounds.width() / 2,
+                 main_view_bounds.bottom() - first_slot_tile.height());
+  SimulateUpdateDrag(FolderGridView(), AppsGridView::MOUSE, dragged, point);
+
+  // Drop it.
+  FolderGridView()->EndDrag(false);
+
+  // The folder should be destroyed.
+  EXPECT_EQ(21, RootViewModel()->view_size());
+  EXPECT_EQ(NULL,
+            delegate_->GetTestModel()->FindFolderItem("single_item_folder"));
+}
+
 // Test that an interrupted drag while reparenting an item from a folder, when
 // canceled via the root grid, correctly forwards the cancelation to the drag
 // ocurring from the folder.
 TEST_F(AppListMainViewTest, MouseDragItemOutOfFolderWithCancel) {
   CreateAndOpenSingleItemFolder();
   AppListItemView* dragged = StartDragForReparent(0);
 
   // Now add an item to the model, not in any folder, e.g., as if by Sync.
   EXPECT_TRUE(RootGridView()->has_dragged_view());
   EXPECT_TRUE(FolderGridView()->has_dragged_view());
   delegate_->GetTestModel()->CreateAndAddItem("Extra");
 
   // The drag operation should get canceled.
   EXPECT_FALSE(RootGridView()->has_dragged_view());
   EXPECT_FALSE(FolderGridView()->has_dragged_view());
 
   // Additional mouse move operations should be ignored.
   gfx::Point point(1, 1);
   SimulateUpdateDrag(FolderGridView(), AppsGridView::MOUSE, dragged, point);
   EXPECT_FALSE(RootGridView()->has_dragged_view());
   EXPECT_FALSE(FolderGridView()->has_dragged_view());
 }
 
 }  // namespace test
 }  // namespace app_list