Disable folder UI when app sync is disabled

ui/app_list/views/apps_grid_view_unittest.cc

Index: ui/app_list/views/apps_grid_view_unittest.cc
diff --git a/ui/app_list/views/apps_grid_view_unittest.cc b/ui/app_list/views/apps_grid_view_unittest.cc
index 181f51ce3d1267019c0b6050201a989d68ef16a8..95e4f855ced0d65a0fbe4e9abaf3f674bc3a0f9f 100644
--- a/ui/app_list/views/apps_grid_view_unittest.cc
+++ b/ui/app_list/views/apps_grid_view_unittest.cc
@@ -106,6 +106,7 @@ class AppsGridViewTest : public views::ViewsTestBase {
   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);
@@ -280,7 +281,7 @@ TEST_F(AppsGridViewTest, RemoveSelectedLastApp) {
 }
 
 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"),
@@ -550,7 +551,7 @@ TEST_F(AppsGridViewTest, MouseDragFlipPage) {
 }
 
 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"),