Upstream version 7.36.149.0

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

diff --git a/src/chrome/browser/sync/test/integration/enable_disable_test.cc b/src/chrome/browser/sync/test/integration/enable_disable_test.cc
index 7fecc87..8e70c60 100644 (file)
--- a/src/chrome/browser/sync/test/integration/enable_disable_test.cc
+++ b/src/chrome/browser/sync/test/integration/enable_disable_test.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/browser/sync/profile_sync_service.h"
+#include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
-
-#include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/read_node.h"
 #include "sync/internal_api/public/read_transaction.h"
@@ -14,17 +14,11 @@
 
 namespace {
 
-class EnableDisableTest : public SyncTest {
- public:
-  explicit EnableDisableTest(TestType test_type) : SyncTest(test_type) {}
-  virtual ~EnableDisableTest() {}
- private:
-  DISALLOW_COPY_AND_ASSIGN(EnableDisableTest);
-};
-
-class EnableDisableSingleClientTest : public EnableDisableTest {
+class EnableDisableSingleClientTest : public SyncTest {
  public:
-  EnableDisableSingleClientTest() : EnableDisableTest(SINGLE_CLIENT) {}
+  // TODO(pvalenzuela): Switch to SINGLE_CLIENT once FakeServer
+  // supports this scenario.
+  EnableDisableSingleClientTest() : SyncTest(SINGLE_CLIENT_LEGACY) {}
   virtual ~EnableDisableSingleClientTest() {}
  private:
   DISALLOW_COPY_AND_ASSIGN(EnableDisableSingleClientTest);
@@ -50,8 +44,8 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableOneAtATime) {
   DisableNotifications();
 
   const syncer::ModelTypeSet registered_types =
-      GetClient(0)->service()->GetRegisteredDataTypes();
-  syncer::UserShare* user_share = GetClient(0)->service()->GetUserShare();
+      GetSyncService((0))->GetRegisteredDataTypes();
+  syncer::UserShare* user_share = GetSyncService((0))->GetUserShare();
   for (syncer::ModelTypeSet::Iterator it = registered_types.First();
        it.Good(); it.Inc()) {
     ASSERT_TRUE(GetClient(0)->EnableSyncForDatatype(it.Get()));
@@ -96,9 +90,9 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, DisableOneAtATime) {
   DisableNotifications();
 
   const syncer::ModelTypeSet registered_types =
-      GetClient(0)->service()->GetRegisteredDataTypes();
+      GetSyncService((0))->GetRegisteredDataTypes();
 
-  syncer::UserShare* user_share = GetClient(0)->service()->GetUserShare();
+  syncer::UserShare* user_share = GetSyncService((0))->GetUserShare();
 
   // Make sure all top-level nodes exist first.
   for (syncer::ModelTypeSet::Iterator it = registered_types.First();
@@ -110,9 +104,11 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, DisableOneAtATime) {
 
   for (syncer::ModelTypeSet::Iterator it = registered_types.First();
        it.Good(); it.Inc()) {
-    // MANAGED_USERS is always synced.
+    // MANAGED_USERS and MANAGED_USER_SETTINGS are always synced.
     if (it.Get() == syncer::MANAGED_USERS ||
-        it.Get() == syncer::SYNCED_NOTIFICATIONS)
+        it.Get() == syncer::MANAGED_USER_SHARED_SETTINGS ||
+        it.Get() == syncer::SYNCED_NOTIFICATIONS ||
+        it.Get() == syncer::SYNCED_NOTIFICATION_APP_INFO)
       continue;
 
     ASSERT_TRUE(GetClient(0)->DisableSyncForDatatype(it.Get()));
@@ -133,7 +129,7 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, DisableOneAtATime) {
     }
 
     syncer::UserShare* user_share =
-        GetClient(0)->service()->GetUserShare();
+        GetSyncService((0))->GetUserShare();
 
     ASSERT_FALSE(DoesTopLevelNodeExist(user_share, it.Get()))
         << syncer::ModelTypeToString(it.Get());