Disable app list folders by default for non-ChromeOS platforms.

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 <string>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 292 matching lines @@
   // Adding a launcher item cancels the drag and respects the order.
   SimulateDrag(AppsGridView::MOUSE, from, to);
   model_->CreateAndAddItem("Extra");
   apps_grid_view_->EndDrag(false);
   EXPECT_EQ(std::string("Item 1,Item 2,Item 3,Extra"),
             model_->GetModelContent());
   test_api_->LayoutToIdealBounds();
 }
 
 TEST_F(AppsGridViewTest, MouseDragItemIntoFolder) {
+  CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnableFolderUI);
   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) {
+  CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnableFolderUI);
   // 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 26 matching lines @@
   apps_grid_view_->EndDrag(false);
   EXPECT_EQ(2u, model_->top_level_item_list()->item_count());
   EXPECT_EQ(model_->GetItemName(kMaxFolderItems),
             model_->top_level_item_list()->item_at(0)->id());
   EXPECT_EQ(folder_item->id(), model_->top_level_item_list()->item_at(1)->id());
   EXPECT_EQ(kMaxFolderItems, folder_item->ChildItemCount());
   test_api_->LayoutToIdealBounds();
 }
 
 TEST_F(AppsGridViewTest, MouseDragItemReorder) {
+  CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnableFolderUI);
   size_t kTotalItems = 2;
   model_->PopulateApps(kTotalItems);
   EXPECT_EQ(2u, model_->top_level_item_list()->item_count());
   EXPECT_EQ(std::string("Item 0,Item 1"), model_->GetModelContent());
 
   gfx::Point from = GetItemTileRectAt(0, 1).CenterPoint();
   int reorder_offset = (GetItemTileRectAt(0, 1).CenterPoint() -
                         GetItemTileRectAt(0, 0).CenterPoint()).Length() -
                        kReorderDroppingCircleRadius -
                        kPreferredIconDimension / 2 + 5;
   gfx::Point to = gfx::Point(from.x() - reorder_offset, from.y());
 
   // Dragging item_1 closing to item_0 should leads to re-ordering these two
   // items.
   SimulateDrag(AppsGridView::MOUSE, from, to);
   apps_grid_view_->EndDrag(false);
   EXPECT_EQ(2u, model_->top_level_item_list()->item_count());
   EXPECT_EQ(std::string("Item 1,Item 0"), model_->GetModelContent());
   test_api_->LayoutToIdealBounds();
 }
 
 TEST_F(AppsGridViewTest, MouseDragFolderReorder) {
+  CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnableFolderUI);
   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 253 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