Upstream version 7.35.139.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync / test / integration / two_client_app_list_sync_test.cc

diff --git a/src/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc b/src/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc
index cfcd6b3..c884f1e 100644 (file)
--- a/src/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc
+++ b/src/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc
@@ -14,7 +14,6 @@
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/browser/ui/app_list/app_list_syncable_service.h"
 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"
-#include "chrome/common/chrome_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/extension_prefs.h"
@@ -57,6 +56,11 @@ class TwoClientAppListSyncTest : public SyncTest {
   virtual ~TwoClientAppListSyncTest() {}
 
   // SyncTest
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    SyncTest::SetUpCommandLine(command_line);
+    command_line->AppendSwitch(app_list::switches::kEnableSyncAppList);
+  }
+
   virtual bool SetupClients() OVERRIDE {
     if (!SyncTest::SetupClients())
       return false;
@@ -470,6 +474,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientAppListSyncTest, RemoveDefault) {
   EXPECT_EQ(sync_pb::AppListSpecifics::TYPE_APP, sync_item->item_type);
 }
 
+#if !defined(OS_MACOSX)
+
 class TwoClientAppListSyncFolderTest : public TwoClientAppListSyncTest {
  public:
   TwoClientAppListSyncFolderTest() {}
@@ -568,3 +574,5 @@ IN_PROC_BROWSER_TEST_F(TwoClientAppListSyncFolderTest, FolderAddRemove) {
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllProfilesHaveSameAppListAsVerifier());
 }
+
+#endif  // !defined(OS_MACOSX)