Disable folder UI when app sync is disabled

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 88 matching lines @@
 
 class AppsGridViewTest : public views::ViewsTestBase {
  public:
   AppsGridViewTest() {}
   virtual ~AppsGridViewTest() {}
 
   // testing::Test overrides:
   virtual void SetUp() OVERRIDE {
     views::ViewsTestBase::SetUp();
     model_.reset(new AppListTestModel);
+    model_->SetFoldersEnabled(true);
 
     apps_grid_view_.reset(new AppsGridView(NULL));
     apps_grid_view_->SetLayout(kIconDimension, kCols, kRows);
     apps_grid_view_->SetBoundsRect(gfx::Rect(gfx::Size(kWidth, kHeight)));
     apps_grid_view_->SetModel(model_.get());
     apps_grid_view_->SetItemList(model_->top_level_item_list());
 
     test_api_.reset(new AppsGridViewTestApi(apps_grid_view_.get()));
   }
   virtual void TearDown() OVERRIDE {
@@ skipping 154 matching lines @@
 
   EXPECT_FALSE(apps_grid_view_->IsSelectedView(last_view));
 
   // No crash happens.
   AppListItemView* view = GetItemViewAt(0);
   apps_grid_view_->SetSelectedView(view);
   EXPECT_TRUE(apps_grid_view_->IsSelectedView(view));
 }
 
 TEST_F(AppsGridViewTest, MouseDragWithFolderDisabled) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(switches::kDisableSyncAppList);
+  model_->SetFoldersEnabled(false);
   const int kTotalItems = 4;
   model_->PopulateApps(kTotalItems);
   EXPECT_EQ(std::string("Item 0,Item 1,Item 2,Item 3"),
             model_->GetModelContent());
 
   gfx::Point from = GetItemTileRectAt(0, 0).CenterPoint();
   gfx::Point to = GetItemTileRectAt(0, 1).CenterPoint();
 
   // Dragging changes model order.
   SimulateDrag(AppsGridView::MOUSE, from, to);
@@ skipping 249 matching lines @@
 
   EXPECT_TRUE(page_flip_waiter.Wait(0));
   EXPECT_EQ(0, GetPaginationModel()->selected_page());
 
   EXPECT_FALSE(page_flip_waiter.Wait(100));
   EXPECT_EQ(0, GetPaginationModel()->selected_page());
   apps_grid_view_->EndDrag(true);
 }
 
 TEST_F(AppsGridViewTest, SimultaneousDragWithFolderDisabled) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(switches::kDisableSyncAppList);
+  model_->SetFoldersEnabled(false);
   const int kTotalItems = 4;
   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();
 
   gfx::Point touch_from = GetItemTileRectAt(1, 0).CenterPoint();
   gfx::Point touch_to = GetItemTileRectAt(1, 1).CenterPoint();
@@ skipping 148 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