Revert "Revert 182527" ([Sync] Make SESSIONS an implicit type)

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

Index: chrome/browser/sync/test/integration/enable_disable_test.cc
diff --git a/chrome/browser/sync/test/integration/enable_disable_test.cc b/chrome/browser/sync/test/integration/enable_disable_test.cc
index 09150564eab398bb1e877147241a15b8c775b309..38ba9376ae648a3d9640a1ef5ce6b95f0a940cc4 100644
--- a/chrome/browser/sync/test/integration/enable_disable_test.cc
+++ b/chrome/browser/sync/test/integration/enable_disable_test.cc
@@ -57,17 +57,25 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableOneAtATime) {
     ASSERT_TRUE(GetClient(0)->EnableSyncForDatatype(it.Get()));
 
     // AUTOFILL_PROFILE is lumped together with AUTOFILL.
-    if (it.Get() == syncer::AUTOFILL_PROFILE) {
+    // SESSIONS is lumped together with PROXY_TABS and
+    // HISTORY_DELETE_DIRECTIVES.
+    if (it.Get() == syncer::AUTOFILL_PROFILE || it.Get() == syncer::SESSIONS) {
       continue;
     }
 
-    ASSERT_TRUE(DoesTopLevelNodeExist(user_share, it.Get()))
-        << syncer::ModelTypeToString(it.Get());
+    if (!syncer::ProxyTypes().Has(it.Get())) {
+      ASSERT_TRUE(DoesTopLevelNodeExist(user_share, it.Get()))
+          << syncer::ModelTypeToString(it.Get());
+    }
 
     // AUTOFILL_PROFILE is lumped together with AUTOFILL.
     if (it.Get() == syncer::AUTOFILL) {
       ASSERT_TRUE(DoesTopLevelNodeExist(user_share,
                                         syncer::AUTOFILL_PROFILE));
+    } else if (it.Get() == syncer::HISTORY_DELETE_DIRECTIVES ||
+               it.Get() == syncer::PROXY_TABS) {
+      ASSERT_TRUE(DoesTopLevelNodeExist(user_share,
+                                        syncer::SESSIONS));
     }
   }
 
@@ -93,7 +101,9 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, DisableOneAtATime) {
   // Make sure all top-level nodes exist first.
   for (syncer::ModelTypeSet::Iterator it = registered_types.First();
        it.Good(); it.Inc()) {
-    ASSERT_TRUE(DoesTopLevelNodeExist(user_share, it.Get()));
+    if (!syncer::ProxyTypes().Has(it.Get())) {
+      ASSERT_TRUE(DoesTopLevelNodeExist(user_share, it.Get()));
+    }
   }
 
   for (syncer::ModelTypeSet::Iterator it = registered_types.First();
@@ -101,7 +111,9 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, DisableOneAtATime) {
     ASSERT_TRUE(GetClient(0)->DisableSyncForDatatype(it.Get()));
 
     // AUTOFILL_PROFILE is lumped together with AUTOFILL.
-    if (it.Get() == syncer::AUTOFILL_PROFILE) {
+    // SESSIONS is lumped together with PROXY_TABS and
+    // HISTORY_DELETE_DIRECTIVES.
+    if (it.Get() == syncer::AUTOFILL_PROFILE || it.Get() == syncer::SESSIONS) {
       continue;
     }
 
@@ -115,6 +127,10 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, DisableOneAtATime) {
     if (it.Get() == syncer::AUTOFILL) {
       ASSERT_FALSE(DoesTopLevelNodeExist(user_share,
                                          syncer::AUTOFILL_PROFILE));
+    } else if (it.Get() == syncer::HISTORY_DELETE_DIRECTIVES ||
+               it.Get() == syncer::PROXY_TABS) {
+      ASSERT_FALSE(DoesTopLevelNodeExist(user_share,
+                                         syncer::SESSIONS));
     }
   }