Disable folder UI when app sync is disabled

chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc

Index: chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc b/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc
index 371f596f43e054f76a9aeb1a57e97aee8154d9a7..616befb624a7fab2bb19953dd94504fed6b403d9 100644
--- a/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc
@@ -18,6 +18,7 @@
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_system.h"
+#include "ui/app_list/app_list_model.h"
 #include "ui/app_list/app_list_switches.h"
 
 using apps_helper::DisableApp;
@@ -485,6 +486,14 @@ class TwoClientAppListSyncFolderTest : public TwoClientAppListSyncTest {
     TwoClientAppListSyncTest::SetUpCommandLine(command_line);
   }
 
+  virtual bool SetupClients() OVERRIDE {
+    bool res = TwoClientAppListSyncTest::SetupClients();
+    app_list::AppListSyncableService* verifier_service =
+        app_list::AppListSyncableServiceFactory::GetForProfile(verifier());
+    verifier_service->model()->SetFoldersEnabled(true);
+    return res;
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(TwoClientAppListSyncFolderTest);
 };