[Sync] Register USS types with ModelTypeRegistry before download

sync/sessions/model_type_registry_unittest.cc

Index: sync/sessions/model_type_registry_unittest.cc
diff --git a/sync/sessions/model_type_registry_unittest.cc b/sync/sessions/model_type_registry_unittest.cc
index 4ae31f8dbf6f5dead7d7904532c25e5a018baa64..1b5763c536a63ad4b7e389b7551dd66ac65d70cd 100644
--- a/sync/sessions/model_type_registry_unittest.cc
+++ b/sync/sessions/model_type_registry_unittest.cc
@@ -105,8 +105,14 @@ TEST_F(ModelTypeRegistryTest, SetEnabledDirectoryTypes_Once) {
   routing_info.insert(std::make_pair(NIGORI, GROUP_PASSIVE));
   routing_info.insert(std::make_pair(BOOKMARKS, GROUP_UI));
   routing_info.insert(std::make_pair(AUTOFILL, GROUP_DB));
+  routing_info.insert(std::make_pair(APPS, GROUP_NON_BLOCKING));
 
   registry()->SetEnabledDirectoryTypes(routing_info);
+
+  UpdateHandlerMap* update_handler_map = registry()->update_handler_map();
+  // Apps is non-blocking type, SetEnabledDirectoryTypes shouldn't instantiate
+  // update_handler for it.
+  EXPECT_TRUE(update_handler_map->find(APPS) == update_handler_map->end());

[Nicolas Zea, 2016/04/04 20:25:43]

nit: EXPECT_EQ?

[pavely, 2016/04/05 18:21:52]

I think the benefit of EXPECT_EQ is that it prints values of expressions for
both sides: value of ABC (which is 123) doesn't match value of XYZ (which is
789).

In this case value of iterator is probably some hex number which doesn't  make
sense, important part is whether it equals map::end() or not.

 }
 
 // Try two different routing info settings.
@@ -118,6 +124,7 @@ TEST_F(ModelTypeRegistryTest, SetEnabledDirectoryTypes_Repeatedly) {
   routing_info1.insert(std::make_pair(NIGORI, GROUP_PASSIVE));
   routing_info1.insert(std::make_pair(BOOKMARKS, GROUP_PASSIVE));
   routing_info1.insert(std::make_pair(AUTOFILL, GROUP_PASSIVE));
+  routing_info1.insert(std::make_pair(APPS, GROUP_NON_BLOCKING));
 
   registry()->SetEnabledDirectoryTypes(routing_info1);
 
@@ -125,6 +132,7 @@ TEST_F(ModelTypeRegistryTest, SetEnabledDirectoryTypes_Repeatedly) {
   routing_info2.insert(std::make_pair(NIGORI, GROUP_PASSIVE));
   routing_info2.insert(std::make_pair(BOOKMARKS, GROUP_UI));
   routing_info2.insert(std::make_pair(AUTOFILL, GROUP_DB));
+  routing_info2.insert(std::make_pair(APPS, GROUP_NON_BLOCKING));
 
   registry()->SetEnabledDirectoryTypes(routing_info2);
 }
@@ -138,6 +146,7 @@ TEST_F(ModelTypeRegistryTest, SetEnabledDirectoryTypes_Clear) {
   routing_info1.insert(std::make_pair(NIGORI, GROUP_PASSIVE));
   routing_info1.insert(std::make_pair(BOOKMARKS, GROUP_UI));
   routing_info1.insert(std::make_pair(AUTOFILL, GROUP_DB));
+  routing_info1.insert(std::make_pair(APPS, GROUP_NON_BLOCKING));
 
   registry()->SetEnabledDirectoryTypes(routing_info1);
 
@@ -154,6 +163,7 @@ TEST_F(ModelTypeRegistryTest, SetEnabledDirectoryTypes_OffAndOn) {
   routing_info1.insert(std::make_pair(NIGORI, GROUP_PASSIVE));
   routing_info1.insert(std::make_pair(BOOKMARKS, GROUP_UI));
   routing_info1.insert(std::make_pair(AUTOFILL, GROUP_DB));
+  routing_info1.insert(std::make_pair(APPS, GROUP_NON_BLOCKING));
 
   registry()->SetEnabledDirectoryTypes(routing_info1);
 
@@ -202,6 +212,10 @@ TEST_F(ModelTypeRegistryTest, NonBlockingTypesWithDirectoryTypes) {
   routing_info1.insert(std::make_pair(NIGORI, GROUP_PASSIVE));
   routing_info1.insert(std::make_pair(BOOKMARKS, GROUP_UI));
   routing_info1.insert(std::make_pair(AUTOFILL, GROUP_DB));
+  routing_info1.insert(std::make_pair(THEMES, GROUP_NON_BLOCKING));
+  routing_info1.insert(std::make_pair(SESSIONS, GROUP_NON_BLOCKING));
+
+  ModelTypeSet directory_types(NIGORI, BOOKMARKS, AUTOFILL);
 
   ModelTypeSet current_types;
   EXPECT_TRUE(registry()->GetEnabledTypes().Empty());
@@ -215,7 +229,7 @@ TEST_F(ModelTypeRegistryTest, NonBlockingTypesWithDirectoryTypes) {
 
   // Add some directory types.
   registry()->SetEnabledDirectoryTypes(routing_info1);
-  current_types.PutAll(GetRoutingInfoTypes(routing_info1));
+  current_types.PutAll(directory_types);
   EXPECT_TRUE(registry()->GetEnabledTypes().Equals(current_types));
 
   // Add sessions non-blocking type.
@@ -234,7 +248,7 @@ TEST_F(ModelTypeRegistryTest, NonBlockingTypesWithDirectoryTypes) {
   // Clear all directory types.
   ModelSafeRoutingInfo routing_info2;
   registry()->SetEnabledDirectoryTypes(routing_info2);
-  current_types.RemoveAll(GetRoutingInfoTypes(routing_info1));
+  current_types.RemoveAll(directory_types);
   EXPECT_TRUE(registry()->GetEnabledTypes().Equals(current_types));
 }