Sync GN tests with GYP build.

This updates GN's app_list_unittests, base_unittests, cast_unittests, cc_unittests, components_unittests, crypto_unittests, events_unittests, and gl_unittests to match the GYP build (with the exception of some NaCl-specific ones).

The printing component is now hooked up to all components, and the printing names were fixed to be GN-style and to be source sets instead of shared libraries.

CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

Review URL: https://codereview.chromium.org/1295233003

Cr-Commit-Position: refs/heads/master@{#344024}

16 files changed, 49 insertions, 11 deletions

diff --git a/base/BUILD.gn b/base/BUILD.gn
index ccb580f..7b7cdb9 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1251,6 +1251,7 @@ test("base_unittests") {
     "files/file_util_proxy_unittest.cc",
     "files/file_util_unittest.cc",
     "files/important_file_writer_unittest.cc",
+    "files/memory_mapped_file_unittest.cc",
     "files/scoped_temp_dir_unittest.cc",
     "gmock_unittest.cc",
     "guid_unittest.cc",
@@ -1311,6 +1312,7 @@ test("base_unittests") {
     "metrics/field_trial_unittest.cc",
     "metrics/histogram_base_unittest.cc",
     "metrics/histogram_delta_serialization_unittest.cc",
+    "metrics/histogram_macros_unittest.cc",
     "metrics/histogram_snapshot_manager_unittest.cc",
     "metrics/histogram_unittest.cc",
     "metrics/sample_map_unittest.cc",
@@ -1381,6 +1383,7 @@ test("base_unittests") {
     "task_runner_util_unittest.cc",
     "template_util_unittest.cc",
     "test/histogram_tester_unittest.cc",
+    "test/test_pending_task_unittest.cc",
     "test/test_reg_util_win_unittest.cc",
     "test/trace_event_analyzer_unittest.cc",
     "test/user_action_tester_unittest.cc",
diff --git a/cc/BUILD.gn b/cc/BUILD.gn
index 11d0363..75e6513 100644
--- a/cc/BUILD.gn
+++ b/cc/BUILD.gn
@@ -721,6 +721,7 @@ test("cc_unittests") {
     "animation/scrollbar_animation_controller_linear_fade_unittest.cc",
     "animation/scrollbar_animation_controller_thinning_unittest.cc",
     "animation/transform_operations_unittest.cc",
+    "base/delayed_unique_notifier_unittest.cc",
     "base/float_quad_unittest.cc",
     "base/histograms_unittest.cc",
     "base/list_container_unittest.cc",
@@ -731,8 +732,10 @@ test("cc_unittests") {
     "base/sidecar_list_container_unittest.cc",
     "base/simple_enclosed_region_unittest.cc",
     "base/tiling_data_unittest.cc",
+    "base/unique_notifier_unittest.cc",
     "debug/frame_timing_tracker_unittest.cc",
     "debug/micro_benchmark_controller_unittest.cc",
+    "debug/rendering_stats_unittest.cc",
     "input/scroll_state_unittest.cc",
     "input/top_controls_manager_unittest.cc",
     "layers/delegated_frame_provider_unittest.cc",
@@ -768,6 +771,7 @@ test("cc_unittests") {
     "layers/video_frame_provider_client_impl_unittest.cc",
     "layers/video_layer_impl_unittest.cc",
     "output/begin_frame_args_unittest.cc",
+    "output/bsp_tree_unittest.cc",
     "output/delegating_renderer_unittest.cc",
     "output/filter_operations_unittest.cc",
     "output/gl_renderer_unittest.cc",
@@ -787,6 +791,7 @@ test("cc_unittests") {
     "playback/picture_unittest.cc",
     "playback/pixel_ref_map_unittest.cc",
     "playback/recording_source_unittest.cc",
+    "quads/draw_polygon_unittest.cc",
     "quads/draw_quad_unittest.cc",
     "quads/render_pass_unittest.cc",
     "raster/scoped_gpu_raster_unittest.cc",
@@ -805,6 +810,7 @@ test("cc_unittests") {
     "scheduler/scheduler_state_machine_unittest.cc",
     "scheduler/scheduler_unittest.cc",
     "test/layer_tree_json_parser_unittest.cc",
+    "test/ordered_simple_task_runner_unittest.cc",
     "test/test_web_graphics_context_3d_unittest.cc",
     "tiles/picture_layer_tiling_set_unittest.cc",
     "tiles/picture_layer_tiling_unittest.cc",
@@ -839,9 +845,13 @@ test("cc_unittests") {
     "trees/tree_synchronizer_unittest.cc",
 
     # Surfaces test files.
+    "surfaces/display_scheduler_unittest.cc",
+    "surfaces/display_unittest.cc",
     "surfaces/surface_aggregator_test_helpers.cc",
     "surfaces/surface_aggregator_test_helpers.h",
     "surfaces/surface_aggregator_unittest.cc",
+    "surfaces/surface_display_output_surface_unittest.cc",
+    "surfaces/surface_factory_unittest.cc",
     "surfaces/surface_hittest_unittest.cc",
     "surfaces/surface_unittest.cc",
     "surfaces/surfaces_pixeltest.cc",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index bf72df6..76e58ef 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -604,7 +604,7 @@ source_set("browser") {
                            "//chrome")
     deps += [
       "//printing",
-      "//components/printing/browser:printing_browser",
+      "//components/printing/browser",
     ]
 
     if (is_win) {
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
index 9403f2d..a76903e 100644
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -169,7 +169,7 @@ static_library("common") {
   # Printing.
   if (enable_basic_printing || enable_print_preview) {
     deps += [
-      "//components/printing/common:printing_common",
+      "//components/printing/common",
       "//printing",
     ]
     if (enable_print_preview) {
diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
index 6f8773a..ee9e894 100644
--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn
@@ -46,7 +46,7 @@ static_library("renderer") {
     "//components/omnibox/common",
     "//components/password_manager/content/renderer",
     "//components/plugins/renderer",
-    "//components/printing/renderer:printing_renderer",
+    "//components/printing/renderer",
     "//components/startup_metric_utils",
     "//components/translate/content/renderer",
     "//components/translate/core/common",
diff --git a/components/BUILD.gn b/components/BUILD.gn
index e79db964..3c9d278 100644
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -398,6 +398,14 @@ test("components_unittests") {
       "//components/scheduler:unit_tests",
     ]
   }
+
+  if (enable_basic_printing || enable_print_preview) {
+    deps += [
+      "//components/printing/browser",
+      "//components/printing/common",
+      "//components/printing/renderer",
+    ]
+  }
 }
 
 repack("components_tests_pak") {
@@ -429,6 +437,7 @@ test("components_browsertests") {
     "autofill/content/renderer/password_form_conversion_utils_browsertest.cc",
     "dom_distiller/content/browser/distillable_page_utils_browsertest.cc",
     "dom_distiller/content/browser/distiller_page_web_contents_browsertest.cc",
+    "dom_distiller/content/browser/test/dom_distiller_js_browsertest.cc",
     "password_manager/content/renderer/credential_manager_client_browsertest.cc",
   ]
 
@@ -494,6 +503,11 @@ test("components_browsertests") {
       "//base:prefs_test_support",
     ]
   }
+
+  if (enable_basic_printing || enable_print_preview) {
+    sources += [ "printing/test/print_web_view_helper_browsertest.cc" ]
+    deps += [ "//components/printing/test:test_support" ]
+  }
 }
 
 test("components_perftests") {
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 20ca1add..dc4a2a9 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -1445,6 +1445,7 @@
             'HAS_OUT_OF_PROC_TEST_RUNNER',
           ],
           'sources': [
+            # Note: test list duplicated in GN build.
             'autofill/content/browser/risk/fingerprint_browsertest.cc',
             'autofill/content/renderer/password_form_conversion_utils_browsertest.cc',
             'dom_distiller/content/browser/distillable_page_utils_browsertest.cc',
diff --git a/components/printing/browser/BUILD.gn b/components/printing/browser/BUILD.gn
index b33879d..b0cde36 100644
--- a/components/printing/browser/BUILD.gn
+++ b/components/printing/browser/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-static_library("printing_browser") {
+source_set("browser") {
   sources = [
     "print_manager.cc",
     "print_manager.h",
diff --git a/components/printing/common/BUILD.gn b/components/printing/common/BUILD.gn
index d56e4e2..0bc5669 100644
--- a/components/printing/common/BUILD.gn
+++ b/components/printing/common/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-static_library("printing_common") {
+source_set("common") {
   sources = [
     "print_messages.cc",
     "print_messages.h",
diff --git a/components/printing/renderer/BUILD.gn b/components/printing/renderer/BUILD.gn
index c31bb8e..9267002 100644
--- a/components/printing/renderer/BUILD.gn
+++ b/components/printing/renderer/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-static_library("printing_renderer") {
+source_set("renderer") {
   sources = [
     "print_web_view_helper.cc",
     "print_web_view_helper.h",
@@ -17,7 +17,7 @@ static_library("printing_renderer") {
 
   deps = [
     "//base",
-    "//components/printing/common:printing_common",
+    "//components/printing/common",
     "//components/resources",
     "//content/public/common",
     "//content/public/renderer",
diff --git a/components/printing/test/BUILD.gn b/components/printing/test/BUILD.gn
index 963e5e4..53ac366 100644
--- a/components/printing/test/BUILD.gn
+++ b/components/printing/test/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-static_library("printing_test_support") {
+source_set("test_support") {
   testonly = true
 
   sources = [
@@ -15,7 +15,8 @@ static_library("printing_test_support") {
   ]
 
   deps = [
-    "//components/printing/renderer:printing_renderer",
+    "//components/printing/renderer",
+    "//skia",
     "//testing/gtest",
   ]
 }
diff --git a/crypto/BUILD.gn b/crypto/BUILD.gn
index 6f2adf5..a0cd1ca 100644
--- a/crypto/BUILD.gn
+++ b/crypto/BUILD.gn
@@ -248,7 +248,7 @@ group("crypto_unittests_run") {
 
 test("crypto_unittests") {
   sources = [
-    # Tests.
+    "aead_openssl_unittest.cc",
     "aes_128_gcm_helpers_nss_unittest.cc",
     "curve25519_unittest.cc",
     "ec_private_key_unittest.cc",
diff --git a/media/cast/BUILD.gn b/media/cast/BUILD.gn
index b633d99..7b33520 100644
--- a/media/cast/BUILD.gn
+++ b/media/cast/BUILD.gn
@@ -285,6 +285,7 @@ test("cast_unittests") {
     "logging/simple_event_subscriber_unittest.cc",
     "logging/stats_event_subscriber_unittest.cc",
     "net/cast_transport_sender_impl_unittest.cc",
+    "net/frame_id_wrap_helper_test.cc",
     "net/mock_cast_transport_sender.cc",
     "net/mock_cast_transport_sender.h",
     "net/pacing/mock_paced_packet_sender.cc",
diff --git a/ui/app_list/BUILD.gn b/ui/app_list/BUILD.gn
index 5c8ac14..2cc2392 100644
--- a/ui/app_list/BUILD.gn
+++ b/ui/app_list/BUILD.gn
@@ -324,6 +324,7 @@ test("app_list_unittests") {
       "views/image_shadow_animator_unittest.cc",
       "views/search_box_view_unittest.cc",
       "views/search_result_list_view_unittest.cc",
+      "views/search_result_page_view_unittest.cc",
       "views/speech_view_unittest.cc",
       "views/test/apps_grid_view_test_api.cc",
       "views/test/apps_grid_view_test_api.h",
diff --git a/ui/events/BUILD.gn b/ui/events/BUILD.gn
index efedc2b..32b97c7 100644
--- a/ui/events/BUILD.gn
+++ b/ui/events/BUILD.gn
@@ -391,6 +391,9 @@ test("events_unittests") {
   }
 
   if (use_aura) {
-    sources += [ "gestures/gesture_provider_aura_unittest.cc" ]
+    sources += [
+      "gestures/gesture_provider_aura_unittest.cc",
+      "gestures/motion_event_aura_unittest.cc",
+    ]
   }
 }
diff --git a/ui/gl/BUILD.gn b/ui/gl/BUILD.gn
index 721f351..0eee63e 100644
--- a/ui/gl/BUILD.gn
+++ b/ui/gl/BUILD.gn
@@ -328,6 +328,10 @@ test("gl_unittests") {
     ]
   }
 
+  if (use_x11) {
+    sources += [ "glx_api_unittest.cc" ]
+  }
+
   include_dirs = [ "//third_party/khronos" ]
 
   deps = [