Revert of [Sync] Move data type logic from PSSA to PSS.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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 "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/read_node.h"
 #include "sync/internal_api/public/read_transaction.h"
@@ skipping 26 matching lines @@
                syncer::ModelType type) {
   return data_type_status_table.GetUnreadyErrorTypes().Has(type);
 }
 
 IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableOneAtATime) {
   ASSERT_TRUE(SetupClients());
 
   // Setup sync with no enabled types.
   ASSERT_TRUE(GetClient(0)->SetupSync(syncer::ModelTypeSet()));
 
+  const syncer::ModelTypeSet registered_types =
+      GetSyncService(0)->GetRegisteredDataTypes();
   syncer::UserShare* user_share = GetSyncService(0)->GetUserShare();
   const sync_driver::DataTypeStatusTable& data_type_status_table =
       GetSyncService(0)->data_type_status_table();
-
-  const syncer::ModelTypeSet registered_types =
-      GetSyncService(0)->GetRegisteredDataTypes();
-  const syncer::ModelTypeSet registered_user_types =
-      Intersection(registered_types, syncer::UserSelectableTypes());
-  for (syncer::ModelTypeSet::Iterator it = registered_user_types.First();
+  for (syncer::ModelTypeSet::Iterator it = registered_types.First();
        it.Good(); it.Inc()) {
     ASSERT_TRUE(GetClient(0)->EnableSyncForDatatype(it.Get()));
 
     // AUTOFILL_PROFILE is lumped together with AUTOFILL.
     // SESSIONS is lumped together with PROXY_TABS and
     // HISTORY_DELETE_DIRECTIVES.
     // Favicons are lumped together with PROXY_TABS and
     // HISTORY_DELETE_DIRECTIVES.
     if (it.Get() == syncer::AUTOFILL_PROFILE || it.Get() == syncer::SESSIONS) {
       continue;
@@ skipping 90 matching lines @@
       ASSERT_EQ(GetClient(0)->IsTypePreferred(syncer::TYPED_URLS),
                 DoesTopLevelNodeExist(user_share, syncer::SESSIONS));
     } else if (it.Get() == syncer::PREFERENCES) {
       ASSERT_FALSE(DoesTopLevelNodeExist(user_share,
                                          syncer::PRIORITY_PREFERENCES));
     }
   }
 }
 
 }  // namespace