Merge ziparchiver_unittests into the unit_tests binary.

Bug: 901689
Tbr: jbudorick@chromium.org
Change-Id: I48b28368a6474a279e6f0aa858bcfc3c969ead89
Reviewed-on: https://chromium-review.googlesource.com/c/1348876
Commit-Queue: Sam McNally <sammc@chromium.org>
Reviewed-by: Anand Mistry <amistry@chromium.org>
Cr-Commit-Position: refs/heads/master@{#610510}

BUILD.gn

@@ -15,18 +15,18 @@ import("//build/config/ui.gni")
 import("//components/nacl/features.gni")
 import("//device/vr/buildflags/buildflags.gni")
 import("//extensions/buildflags/buildflags.gni")
-import("//media/media_options.gni")
+import("//gpu/vulkan/features.gni")
 import("//media/gpu/args.gni")
+import("//media/media_options.gni")
 import("//remoting/remoting_enable.gni")
+import("//testing/test.gni")
 import("//third_party/openh264/openh264_args.gni")
 import("//tools/ipc_fuzzer/ipc_fuzzer.gni")
 import("//ui/base/ui_features.gni")
-import("//ui/webui/webui_features.gni")
 import("//ui/ozone/ozone.gni")
+import("//ui/webui/webui_features.gni")
 import("//v8/gni/v8.gni")
 import("//v8/snapshot_toolchain.gni")
-import("//gpu/vulkan/features.gni")
-import("//testing/test.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
@@ -400,7 +400,6 @@ group("gn_all") {
       "//ash:ash_unittests",
       "//ash/app_list:app_list_demo",
       "//ash/app_list:app_list_unittests",
-      "//chrome/browser/resources/chromeos/zip_archiver/cpp:ziparchiver_unittests",
       "//chromeos:chromeos_unittests",
       "//chromeos/components:chromeos_components_unittests",
       "//chromeos/components/proximity_auth:proximity_auth_unittests",

chrome/browser/resources/chromeos/zip_archiver/cpp/BUILD.gn

@@ -2,8 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//testing/test.gni")
-
 static_library("zip_archiver_library") {
   sources = [
     "compressor.cc",
@@ -44,16 +42,15 @@ static_library("zip_archiver_library") {
   ]
 }
 
-test("ziparchiver_unittests") {
+source_set("ziparchiver_unittests") {
+  testonly = true
   sources = [
     "compressor_archive_minizip_unittest.cc",
-    "test_module.cc",
     "volume_archive_minizip_unittest.cc",
   ]
 
   deps = [
     ":zip_archiver_library",
-    "//base/test:run_all_unittests",
     "//testing/gtest",
   ]
 

chrome/browser/resources/chromeos/zip_archiver/cpp/test_module.cc

-// Copyright 2018 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.
-
-#include "ppapi/cpp/module.h"
-
-namespace pp {
-
-// This symbol must be defined in order to link again the ppapi library.
-Module* CreateModule() {
-  return nullptr;
-}
-
-}  // namespace pp

chrome/test/BUILD.gn

@@ -7,8 +7,8 @@ import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
-import("//chrome/common/features.gni")
 import("//chrome/chrome_repack_locales.gni")
+import("//chrome/common/features.gni")
 import("//chromeos/assistant/assistant.gni")
 import("//components/feature_engagement/features.gni")
 import("//components/feed/features.gni")
@@ -22,8 +22,8 @@ import("//mojo/public/tools/bindings/mojom.gni")
 import("//ppapi/buildflags/buildflags.gni")
 import("//remoting/remoting_enable.gni")
 import("//rlz/buildflags/buildflags.gni")
-import("//services/service_manager/public/service_manifest.gni")
 import("//services/catalog/public/tools/catalog.gni")
+import("//services/service_manager/public/service_manifest.gni")
 import("//testing/libfuzzer/fuzzer_test.gni")
 import("//testing/test.gni")
 import("//third_party/widevine/cdm/widevine.gni")
@@ -3480,6 +3480,7 @@ test("unit_tests") {
       "//ash:test_support_with_content",
       "//ash/public/cpp/resources:ash_public_unscaled_resources",
       "//ash/strings",
+      "//chrome/browser/resources/chromeos/zip_archiver/cpp:ziparchiver_unittests",
     ]
   }