Move gn _run target generation into test(). (RELAND)

third_party/cacheinvalidation/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.
 
 import("//testing/test.gni")
 
 config("cacheinvalidation_config") {
   include_dirs = [
     "overrides",
     "src",
@@ skipping 72 matching lines @@
 
   public_deps = [
     "src/google/cacheinvalidation:cacheinvalidation_proto_cpp",
   ]
 
   deps = [
     "//base",
   ]
 }
 
-# TODO(GYP): Delete this after we've converted everything to GN.
-# The _run targets exist only for compatibility w/ GYP.
-group("cacheinvalidation_unittests_run") {
-  testonly = true
-  deps = [
-    ":cacheinvalidation_unittests",
-  ]
-}
-
 test("cacheinvalidation_unittests") {
   sources = [
     "src/google/cacheinvalidation/impl/invalidation-client-impl_test.cc",
     "src/google/cacheinvalidation/impl/protocol-handler_test.cc",
     "src/google/cacheinvalidation/impl/recurring-task_test.cc",
     "src/google/cacheinvalidation/impl/throttle_test.cc",
     "src/google/cacheinvalidation/test/deterministic-scheduler.cc",
     "src/google/cacheinvalidation/test/deterministic-scheduler.h",
     "src/google/cacheinvalidation/test/test-logger.cc",
     "src/google/cacheinvalidation/test/test-logger.h",
@@ skipping 36 matching lines @@
     deps = [
       ":cacheinvalidation_proto_java",
       "//third_party/android_protobuf:protobuf_nano_javalib",
       "//third_party/android_tools:android_gcm_java",
       google_play_services_library,
     ]
 
     DEPRECATED_java_in_dir = "src/java"
   }
 }