Remove --enable-mac-views-app-list on Mac

ui/app_list/views/apps_grid_view_unittest.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 "ui/app_list/views/apps_grid_view.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <string>
@@ skipping 92 matching lines @@
     apps_grid_view_->SetItemList(model_->top_level_item_list());
 
     test_api_.reset(new AppsGridViewTestApi(apps_grid_view_.get()));
   }
   void TearDown() override {
     apps_grid_view_.reset();  // Release apps grid view before models.
     views::ViewsTestBase::TearDown();
   }
 
  protected:
-  void EnsureFoldersEnabled() {
-#if defined(OS_MACOSX)
-    // Folders require toolkit-views app list to be enabled.
-    base::CommandLine::ForCurrentProcess()->AppendSwitch(
-        switches::kEnableMacViewsAppList);
-#endif
-  }
-
   AppListItemView* GetItemViewAt(int index) {
     return static_cast<AppListItemView*>(
         test_api_->GetViewAtModelIndex(index));
   }
 
   AppListItemView* GetItemViewForPoint(const gfx::Point& point) {
     for (size_t i = 0; i < model_->top_level_item_list()->item_count(); ++i) {
       AppListItemView* view = GetItemViewAt(i);
       if (view->bounds().Contains(point))
         return view;
@@ skipping 182 matching lines @@
                             gfx::Point(2, 2), ui::EventTimeForNow(), 0, 0);
   apps_grid_view_->UpdateDragFromItem(AppsGridView::MOUSE, drag_event);
   EXPECT_FALSE(apps_grid_view_->has_dragged_view());
 
   EXPECT_EQ(std::string("Item 1,Item 2,Item 3,Extra"),
             model_->GetModelContent());
   test_api_->LayoutToIdealBounds();
 }
 
 TEST_F(AppsGridViewTest, MouseDragItemIntoFolder) {
-  EnsureFoldersEnabled();
-
   size_t kTotalItems = 3;
   model_->PopulateApps(kTotalItems);
   EXPECT_EQ(model_->top_level_item_list()->item_count(), kTotalItems);
   EXPECT_EQ(std::string("Item 0,Item 1,Item 2"), model_->GetModelContent());
 
   gfx::Point from = GetItemTileRectAt(0, 1).CenterPoint();
   gfx::Point to = GetItemTileRectAt(0, 0).CenterPoint();
 
   // Dragging item_1 over item_0 creates a folder.
   SimulateDrag(AppsGridView::MOUSE, from, to);
@@ skipping 27 matching lines @@
   item_1 = model_->FindItem("Item 1");
   EXPECT_TRUE(item_1->IsInFolder());
   EXPECT_EQ(folder_item->id(), item_1->folder_id());
   AppListItem* item_2 = model_->FindItem("Item 2");
   EXPECT_TRUE(item_2->IsInFolder());
   EXPECT_EQ(folder_item->id(), item_2->folder_id());
   test_api_->LayoutToIdealBounds();
 }
 
 TEST_F(AppsGridViewTest, MouseDragMaxItemsInFolder) {
-  EnsureFoldersEnabled();
-
   // Create and add a folder with 15 items in it.
   size_t kTotalItems = kMaxFolderItems - 1;
   model_->CreateAndPopulateFolderWithApps(kTotalItems);
   EXPECT_EQ(1u, model_->top_level_item_list()->item_count());
   EXPECT_EQ(AppListFolderItem::kItemType,
             model_->top_level_item_list()->item_at(0)->GetItemType());
   AppListFolderItem* folder_item = static_cast<AppListFolderItem*>(
       model_->top_level_item_list()->item_at(0));
   EXPECT_EQ(kTotalItems, folder_item->ChildItemCount());
 
@@ skipping 25 matching lines @@
   SimulateDrag(AppsGridView::MOUSE, from, to);
   apps_grid_view_->EndDrag(false);
   EXPECT_EQ(2u, model_->top_level_item_list()->item_count());
   EXPECT_EQ(kMaxFolderItems, folder_item->ChildItemCount());
   test_api_->LayoutToIdealBounds();
 }
 
 // Check that moving items around doesn't allow a drop to happen into a full
 // folder.
 TEST_F(AppsGridViewTest, MouseDragMaxItemsInFolderWithMovement) {
-  EnsureFoldersEnabled();
-
   // Create and add a folder with 16 items in it.
   size_t kTotalItems = kMaxFolderItems;
   model_->CreateAndPopulateFolderWithApps(kTotalItems);
   EXPECT_EQ(1u, model_->top_level_item_list()->item_count());
   EXPECT_EQ(AppListFolderItem::kItemType,
             model_->top_level_item_list()->item_at(0)->GetItemType());
   AppListFolderItem* folder_item = static_cast<AppListFolderItem*>(
       model_->top_level_item_list()->item_at(0));
   EXPECT_EQ(kTotalItems, folder_item->ChildItemCount());
 
@@ skipping 28 matching lines @@
   apps_grid_view_->UpdateDragFromItem(AppsGridView::MOUSE, drag_event);
   apps_grid_view_->EndDrag(false);
 
   // The item should not have moved into the folder.
   EXPECT_EQ(2u, model_->top_level_item_list()->item_count());
   EXPECT_EQ(kMaxFolderItems, folder_item->ChildItemCount());
   test_api_->LayoutToIdealBounds();
 }
 
 TEST_F(AppsGridViewTest, MouseDragItemReorder) {
-  // This test assumes Folders are enabled.
-  EnsureFoldersEnabled();
-
   model_->PopulateApps(4);
   EXPECT_EQ(4u, model_->top_level_item_list()->item_count());
   EXPECT_EQ(std::string("Item 0,Item 1,Item 2,Item 3"),
             model_->GetModelContent());
 
   // Dragging an item towards its neighbours should not reorder until the drag
   // is past the folder drop point.
   gfx::Point top_right = GetItemTileRectAt(0, 1).CenterPoint();
   gfx::Vector2d drag_vector;
   int half_tile_width =
@@ skipping 36 matching lines @@
   // Dragging down past the last app should reorder to the last position.
   drag_vector.set_x(half_tile_width);
   drag_vector.set_y(2 * tile_height);
   SimulateDrag(AppsGridView::MOUSE, top_right, top_right + drag_vector);
   apps_grid_view_->EndDrag(false);
   EXPECT_EQ(std::string("Item 1,Item 2,Item 3,Item 0"),
             model_->GetModelContent());
 }
 
 TEST_F(AppsGridViewTest, MouseDragFolderReorder) {
-  EnsureFoldersEnabled();
-
   size_t kTotalItems = 2;
   model_->CreateAndPopulateFolderWithApps(kTotalItems);
   model_->PopulateAppWithId(kTotalItems);
   EXPECT_EQ(2u, model_->top_level_item_list()->item_count());
   EXPECT_EQ(AppListFolderItem::kItemType,
             model_->top_level_item_list()->item_at(0)->GetItemType());
   AppListFolderItem* folder_item = static_cast<AppListFolderItem*>(
       model_->top_level_item_list()->item_at(0));
   EXPECT_EQ("Item 2", model_->top_level_item_list()->item_at(1)->id());
 
@@ skipping 112 matching lines @@
   SimulateDrag(AppsGridView::TOUCH, touch_from, touch_to);
   SimulateDrag(AppsGridView::MOUSE, mouse_from, mouse_to);
   // Finishes the drag and touch drag wins.
   apps_grid_view_->EndDrag(false);
   EXPECT_EQ(std::string("Item 1,Item 0,Item 3,Item 2"),
             model_->GetModelContent());
   test_api_->LayoutToIdealBounds();
 }
 
 TEST_F(AppsGridViewTest, UpdateFolderBackgroundOnCancelDrag) {
-  EnsureFoldersEnabled();
-
   const int kTotalItems = 4;
   TestAppsGridViewFolderDelegate folder_delegate;
   apps_grid_view_->set_folder_delegate(&folder_delegate);
   model_->PopulateApps(kTotalItems);
   EXPECT_EQ(std::string("Item 0,Item 1,Item 2,Item 3"),
             model_->GetModelContent());
 
   gfx::Point mouse_from = GetItemTileRectAt(0, 0).CenterPoint();
   gfx::Point mouse_to = GetItemTileRectAt(0, 1).CenterPoint();
 
@@ skipping 113 matching lines @@
   AppListItemView* item_view = GetItemViewAt(0);
   ASSERT_TRUE(item_view);
   const views::Label* title_label = item_view->title();
   EXPECT_FALSE(title_label->GetTooltipText(
       title_label->bounds().CenterPoint(), &actual_tooltip));
   EXPECT_EQ(title, base::UTF16ToUTF8(title_label->text()));
 }
 
 }  // namespace test
 }  // namespace app_list