Revert of Sync more GN unit tests with GYP.

components/invalidation/impl/BUILD.gn

Index: components/invalidation/impl/BUILD.gn
diff --git a/components/invalidation/impl/BUILD.gn b/components/invalidation/impl/BUILD.gn
index 20034c15c02fdc90a29f62c95cc5c2ddad2de958..95be996861d2eca752e682854f5b19c234099a02 100644
--- a/components/invalidation/impl/BUILD.gn
+++ b/components/invalidation/impl/BUILD.gn
@@ -5,7 +5,7 @@
   import("//build/config/android/rules.gni")
 }
 
-source_set("impl") {
+static_library("impl") {
   sources = [
     "invalidation_logger.cc",
     "invalidation_logger.h",
@@ -91,39 +91,14 @@
   }
 }
 
-source_set("unit_tests") {
+group("unittests") {
   testonly = true
-  sources = [
-    "invalidation_logger_unittest.cc",
-  ]
   deps = [
     ":impl",
     ":test_support",
-    "//testing/gmock",
-    "//testing/gtest",
   ]
-
   if (is_android) {
-    sources += [ "invalidation_service_android_unittest.cc" ]
     deps += [ ":jni_headers" ]
-  } else {
-    # Non-Android tests.
-    sources += [
-      "fake_invalidator_unittest.cc",
-      "gcm_network_channel_unittest.cc",
-      "invalidation_notifier_unittest.cc",
-      "invalidator_registrar_unittest.cc",
-      "non_blocking_invalidator_unittest.cc",
-      "object_id_invalidation_map_unittest.cc",
-      "p2p_invalidator_unittest.cc",
-      "push_client_channel_unittest.cc",
-      "registration_manager_unittest.cc",
-      "single_object_invalidation_set_unittest.cc",
-      "sync_invalidation_listener_unittest.cc",
-      "sync_system_resources_unittest.cc",
-      "ticl_invalidation_service_unittest.cc",
-      "unacked_invalidation_set_unittest.cc",
-    ]
   }
 }
 
@@ -148,17 +123,13 @@
     "unacked_invalidation_set_test_util.h",
   ]
 
-  public_deps = [
-    ":impl",
-    "//jingle:notifier_test_util",
-    "//third_party/cacheinvalidation",
-  ]
   deps = [
     "//base",
     "//components/gcm_driver:test_support",
     "//components/keyed_service/core",
     "//google_apis",
     "//jingle:notifier",
+    "//jingle:notifier_test_util",
     "//net",
     "//testing/gmock",
 
@@ -166,6 +137,9 @@
     "//third_party/protobuf:protobuf_lite",
 
     # "//third_party/cacheinvalidation/src/google/cacheinvalidation:cacheinvalidation_proto_cpp",
+  ]
+  public_deps = [
+    "//third_party/cacheinvalidation",
   ]
 
   if (is_android) {