Revert of Sync more GN unit tests with GYP.

components/invalidation/impl/BUILD.gn

 # Copyright 2014 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.
 if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
-source_set("impl") {
+static_library("impl") {
   sources = [
     "invalidation_logger.cc",
     "invalidation_logger.h",
     "invalidation_logger_observer.h",
     "invalidation_prefs.cc",
     "invalidation_prefs.h",
     "invalidation_service_util.cc",
     "invalidation_service_util.h",
     "invalidation_state_tracker.cc",
     "invalidation_state_tracker.h",
@@ skipping 65 matching lines @@
     sources += [
       "android/component_jni_registrar.cc",
       "android/component_jni_registrar.h",
       "invalidation_service_android.cc",
       "invalidation_service_android.h",
     ]
     deps += [ ":jni_headers" ]
   }
 }
 
-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",
-    ]
   }
 }
 
 static_library("test_support") {
   testonly = true
   sources = [
     "fake_invalidation_handler.cc",
     "fake_invalidation_handler.h",
     "fake_invalidation_state_tracker.cc",
     "fake_invalidation_state_tracker.h",
     "fake_invalidator.cc",
     "fake_invalidator.h",
     "invalidation_service_test_template.cc",
     "invalidation_service_test_template.h",
     "invalidation_test_util.cc",
     "invalidation_test_util.h",
     "invalidator_test_template.cc",
     "invalidator_test_template.h",
     "object_id_invalidation_map_test_util.cc",
     "object_id_invalidation_map_test_util.h",
     "unacked_invalidation_set_test_util.cc",
     "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",
 
     # TODO(sync): Remove this (http://crbug.com/133352);
     "//third_party/protobuf:protobuf_lite",
 
     # "//third_party/cacheinvalidation/src/google/cacheinvalidation:cacheinvalidation_proto_cpp",
   ]
+  public_deps = [
+    "//third_party/cacheinvalidation",
+  ]
 
   if (is_android) {
     deps += [ ":jni_headers" ]
   } else {
     sources += [
       "p2p_invalidation_service.cc",
       "p2p_invalidation_service.h",
     ]
   }
 }
@@ skipping 36 matching lines @@
       "//base:base_java_test_support",
     ]
   }
   generate_jni("jni_headers") {
     sources = [
       "android/java/src/org/chromium/components/invalidation/InvalidationService.java",
     ]
     jni_package = "components/invalidation"
   }
 }