[Sync] Enable USS DeviceInfo for bots.

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 "base/macros.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "components/browser_sync/profile_sync_service.h"
 #include "components/sync/base/model_type.h"
 #include "components/sync/syncable/read_node.h"
 #include "components/sync/syncable/read_transaction.h"
 
 // This file contains tests that exercise enabling and disabling data
 // types.
 
 namespace {
 
+using syncer::ModelTypeSet;
+
 class EnableDisableSingleClientTest : public SyncTest {
  public:
   EnableDisableSingleClientTest() : SyncTest(SINGLE_CLIENT) {}
   ~EnableDisableSingleClientTest() override {}
 
   // Don't use self-notifications as they can trigger additional sync cycles.
   bool TestUsesSelfNotifications() override { return false; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(EnableDisableSingleClientTest);
 };
 
 bool DoesTopLevelNodeExist(syncer::UserShare* user_share,
                            syncer::ModelType type) {
     syncer::ReadTransaction trans(FROM_HERE, user_share);
     syncer::ReadNode node(&trans);
     return node.InitTypeRoot(type) == syncer::BaseNode::INIT_OK;
 }
 
 bool IsUnready(const syncer::DataTypeStatusTable& data_type_status_table,
                syncer::ModelType type) {
   return data_type_status_table.GetUnreadyErrorTypes().Has(type);
 }
 
+// The current approach this test class takes is to examine the Directory and
+// check for root nodes to see if a type is currently enabled. While this works
+// for things in the directory, it does not work for USS types. USS does not
+// have any general data access mechanism, at least yet. Until that exists,
+// simply omit types that may be USS from these cases.
+ModelTypeSet UnifiedSyncServiceTypes() {
+  ModelTypeSet set;
+  set.Put(syncer::DEVICE_INFO);
+  return set;

[maxbogue, 2016/12/19 20:55:45]

Can't you just do return ModelTypeSet(syncer::DeviceInfo); ?

Also, shouldn't it be possible to add types conditionally based on their feature
flag? I guess in that case the .Put() structure would work better.

[skym, 2016/12/20 16:11:21]

Done.

+}
+
 IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableOneAtATime) {
   ASSERT_TRUE(SetupClients());
 
   // Setup sync with no enabled types.
-  ASSERT_TRUE(GetClient(0)->SetupSync(syncer::ModelTypeSet()));
+  ASSERT_TRUE(GetClient(0)->SetupSync(ModelTypeSet()));
 
   syncer::UserShare* user_share = GetSyncService(0)->GetUserShare();
   const syncer::DataTypeStatusTable& data_type_status_table =
       GetSyncService(0)->data_type_status_table();
 
-  const syncer::ModelTypeSet registered_types =
+  const ModelTypeSet registered_types =
       GetSyncService(0)->GetRegisteredDataTypes();
-  const syncer::ModelTypeSet registered_user_types =
+  const ModelTypeSet registered_directory_types =
+      Difference(registered_types, UnifiedSyncServiceTypes());
+  const ModelTypeSet registered_directory_user_types =
       Intersection(registered_types, syncer::UserSelectableTypes());
-  for (syncer::ModelTypeSet::Iterator it = registered_user_types.First();
+  for (ModelTypeSet::Iterator it = registered_directory_user_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 16 matching lines @@
     }
   }
 }
 
 IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, DisableOneAtATime) {
   ASSERT_TRUE(SetupClients());
 
   // Setup sync with no disabled types.
   ASSERT_TRUE(GetClient(0)->SetupSync());
 
-  const syncer::ModelTypeSet registered_types =
+  const ModelTypeSet registered_types =
       GetSyncService(0)->GetRegisteredDataTypes();
+  const ModelTypeSet registered_directory_types =
+      Difference(registered_types, UnifiedSyncServiceTypes());
 
   syncer::UserShare* user_share = GetSyncService(0)->GetUserShare();
 
   const syncer::DataTypeStatusTable& data_type_status_table =
       GetSyncService(0)->data_type_status_table();
 
   // Make sure all top-level nodes exist first.
-  for (syncer::ModelTypeSet::Iterator it = registered_types.First();
+  for (ModelTypeSet::Iterator it = registered_directory_types.First();
        it.Good(); it.Inc()) {
     if (!syncer::ProxyTypes().Has(it.Get())) {
       ASSERT_TRUE(DoesTopLevelNodeExist(user_share, it.Get()) ||
                   IsUnready(data_type_status_table, it.Get()));
     }
   }
 
-  for (syncer::ModelTypeSet::Iterator it = registered_types.First();
+  for (ModelTypeSet::Iterator it = registered_directory_types.First();
        it.Good(); it.Inc()) {
     // SUPERVISED_USERS and SUPERVISED_USER_SHARED_SETTINGS are always synced.
     if (it.Get() == syncer::SUPERVISED_USERS ||
         it.Get() == syncer::SUPERVISED_USER_SHARED_SETTINGS ||
         it.Get() == syncer::SYNCED_NOTIFICATIONS ||
         it.Get() == syncer::SYNCED_NOTIFICATION_APP_INFO)
       continue;
 
     // Device info cannot be disabled.
     if (it.Get() == syncer::DEVICE_INFO)
@@ skipping 36 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