2 files changed, 26 insertions, 0 deletions
diff --git a/chromium/components/invalidation/impl/BUILD.gn b/chromium/components/invalidation/impl/BUILD.gn
index 092e48c1c2b..5a9848058de 100644
--- a/chromium/components/invalidation/impl/BUILD.gn
+++ b/chromium/components/invalidation/impl/BUILD.gn
@@ -8,6 +8,8 @@ if (is_android) {
 
 static_library("impl") {
   sources = [
+    "deprecated_invalidator_registrar.cc",
+    "deprecated_invalidator_registrar.h",
     "invalidation_logger.cc",
     "invalidation_logger.h",
     "invalidation_logger_observer.h",
@@ -65,6 +67,10 @@ static_library("impl") {
 
   if (!is_android) {
     sources += [
+      "fcm_invalidation_service.cc",
+      "fcm_invalidation_service.h",
+      "fcm_invalidator.cc",
+      "fcm_invalidator.h",
       "fcm_network_handler.cc",
       "fcm_network_handler.h",
       "fcm_sync_invalidation_listener.cc",
@@ -155,7 +161,10 @@ source_set("unit_tests") {
   } else {
     # Non-Android tests.
     sources += [
+      "deprecated_invalidator_registrar_unittest.cc",
       "fake_invalidator_unittest.cc",
+      "fcm_invalidation_service_unittest.cc",
+      "fcm_invalidator_unittest.cc",
       "fcm_network_handler_unittests.cc",
       "fcm_sync_invalidation_listener_unittest.cc",
       "gcm_invalidation_bridge_unittest.cc",
@@ -203,6 +212,8 @@ static_library("test_support") {
     "fake_invalidator.h",
     "fake_system_resources.cc",
     "fake_system_resources.h",
+    "fcm_fake_invalidator.cc",
+    "fcm_fake_invalidator.h",
     "invalidation_service_test_template.cc",
     "invalidation_service_test_template.h",
     "invalidation_test_util.cc",
diff --git a/chromium/components/invalidation/public/BUILD.gn b/chromium/components/invalidation/public/BUILD.gn
index c41f8c5831e..6bfae174686 100644
--- a/chromium/components/invalidation/public/BUILD.gn
+++ b/chromium/components/invalidation/public/BUILD.gn
@@ -26,6 +26,8 @@ static_library("public") {
     "object_id_invalidation_map.h",
     "single_object_invalidation_set.cc",
     "single_object_invalidation_set.h",
+    "topic_invalidation_map.cc",
+    "topic_invalidation_map.h",
   ]
   public_deps = [
     "//google_apis",
@@ -35,3 +37,16 @@ static_library("public") {
     "//base",
   ]
 }
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [
+    "invalidation_util_unittest.cc",
+  ]
+  deps = [
+    ":public",
+    "//base",
+    "//base/test:test_support",
+    "//testing/gtest",
+  ]
+}