diff --git a/components/headless/test/BUILD.gn b/components/headless/test/BUILD.gn new file mode 100644 index 00000000000000..0935b199adad9e --- /dev/null +++ b/components/headless/test/BUILD.gn @@ -0,0 +1,41 @@ +# Copyright 2023 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//pdf/features.gni") +import("//printing/buildflags/buildflags.gni") + +source_set("test") { + sources = [ + "bitmap_utils.cc", + "bitmap_utils.h", + "capture_std_stream.cc", + "capture_std_stream.h", + ] + + if (enable_printing && enable_pdf) { + sources += [ + "pdf_utils.cc", + "pdf_utils.h", + ] + } + + deps = [ + "//base", + "//pdf:buildflags", + "//printing/buildflags", + ] + + public_deps = [ + "//skia", + "//ui/gfx", + ] + + if (enable_printing) { + deps += [ "//printing" ] + + if (enable_pdf) { + deps += [ "//pdf" ] + } + } +} diff --git a/components/headless/test/DEPS b/components/headless/test/DEPS new file mode 100644 index 00000000000000..f24bc16d06a683 --- /dev/null +++ b/components/headless/test/DEPS @@ -0,0 +1,6 @@ +include_rules = [ + "+pdf", + "+printing", + "+third_party/skia/include", + "+ui/gfx", +] diff --git a/headless/test/bitmap_utils.cc b/components/headless/test/bitmap_utils.cc similarity index 97% rename from headless/test/bitmap_utils.cc rename to components/headless/test/bitmap_utils.cc index df5f83868f3040..5effcddb6002d5 100644 --- a/headless/test/bitmap_utils.cc +++ b/components/headless/test/bitmap_utils.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "headless/test/bitmap_utils.h" +#include "components/headless/test/bitmap_utils.h" #include "base/logging.h" #include "ui/gfx/geometry/point.h" diff --git a/headless/test/bitmap_utils.h b/components/headless/test/bitmap_utils.h similarity index 82% rename from headless/test/bitmap_utils.h rename to components/headless/test/bitmap_utils.h index 912cda6058f60a..b3175b7d8f6e87 100644 --- a/headless/test/bitmap_utils.h +++ b/components/headless/test/bitmap_utils.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef HEADLESS_TEST_BITMAP_UTILS_H_ -#define HEADLESS_TEST_BITMAP_UTILS_H_ +#ifndef COMPONENTS_HEADLESS_TEST_BITMAP_UTILS_H_ +#define COMPONENTS_HEADLESS_TEST_BITMAP_UTILS_H_ #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColor.h" @@ -23,4 +23,4 @@ bool CheckColoredRect(const SkBitmap& bitmap, } // namespace headless -#endif // HEADLESS_TEST_BITMAP_UTILS_H_ +#endif // COMPONENTS_HEADLESS_TEST_BITMAP_UTILS_H_ diff --git a/headless/test/capture_std_stream.cc b/components/headless/test/capture_std_stream.cc similarity index 96% rename from headless/test/capture_std_stream.cc rename to components/headless/test/capture_std_stream.cc index d3389dc416d544..6c9c9c5232d3ba 100644 --- a/headless/test/capture_std_stream.cc +++ b/components/headless/test/capture_std_stream.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "headless/test/capture_std_stream.h" +#include "components/headless/test/capture_std_stream.h" #include #include diff --git a/headless/test/capture_std_stream.h b/components/headless/test/capture_std_stream.h similarity index 84% rename from headless/test/capture_std_stream.h rename to components/headless/test/capture_std_stream.h index 62db11a8108958..fb8ac027115e45 100644 --- a/headless/test/capture_std_stream.h +++ b/components/headless/test/capture_std_stream.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef HEADLESS_TEST_CAPTURE_STD_STREAM_H_ -#define HEADLESS_TEST_CAPTURE_STD_STREAM_H_ +#ifndef COMPONENTS_HEADLESS_TEST_CAPTURE_STD_STREAM_H_ +#define COMPONENTS_HEADLESS_TEST_CAPTURE_STD_STREAM_H_ #include #include @@ -46,4 +46,4 @@ class CaptureStdErr : public CaptureStdStream { } // namespace headless -#endif // HEADLESS_TEST_CAPTURE_STD_STREAM_H_ +#endif // COMPONENTS_HEADLESS_TEST_CAPTURE_STD_STREAM_H_ diff --git a/headless/test/pdf_utils.cc b/components/headless/test/pdf_utils.cc similarity index 96% rename from headless/test/pdf_utils.cc rename to components/headless/test/pdf_utils.cc index f0c1fb3cce5d69..a7dee3fe1f0d3a 100644 --- a/headless/test/pdf_utils.cc +++ b/components/headless/test/pdf_utils.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "headless/test/pdf_utils.h" +#include "components/headless/test/pdf_utils.h" #include "base/logging.h" -#include "headless/test/bitmap_utils.h" +#include "components/headless/test/bitmap_utils.h" #include "pdf/pdf.h" #include "printing/units.h" #include "third_party/abseil-cpp/absl/types/optional.h" diff --git a/headless/test/pdf_utils.h b/components/headless/test/pdf_utils.h similarity index 90% rename from headless/test/pdf_utils.h rename to components/headless/test/pdf_utils.h index 36dcc00c88e556..c4a6a485857cd1 100644 --- a/headless/test/pdf_utils.h +++ b/components/headless/test/pdf_utils.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef HEADLESS_TEST_PDF_UTILS_H_ -#define HEADLESS_TEST_PDF_UTILS_H_ +#ifndef COMPONENTS_HEADLESS_TEST_PDF_UTILS_H_ +#define COMPONENTS_HEADLESS_TEST_PDF_UTILS_H_ #include #include @@ -47,4 +47,4 @@ class PDFPageBitmap { } // namespace headless -#endif // HEADLESS_TEST_PDF_UTILS_H_ +#endif // COMPONENTS_HEADLESS_TEST_PDF_UTILS_H_ diff --git a/headless/BUILD.gn b/headless/BUILD.gn index 61ac547c155c72..9a430a9c95c13f 100644 --- a/headless/BUILD.gn +++ b/headless/BUILD.gn @@ -692,10 +692,6 @@ test("headless_browsertests") { "//v8:external_startup_data", ] sources = [ - "test/bitmap_utils.cc", - "test/bitmap_utils.h", - "test/capture_std_stream.cc", - "test/capture_std_stream.h", "test/headless_browser_browsertest.cc", "test/headless_browser_context_browsertest.cc", "test/headless_browser_test.cc", @@ -714,11 +710,7 @@ test("headless_browsertests") { ] if (enable_printing && enable_pdf) { - sources += [ - "test/headless_printtopdf_browsertest.cc", - "test/pdf_utils.cc", - "test/pdf_utils.h", - ] + sources += [ "test/headless_printtopdf_browsertest.cc" ] } if (headless_use_policy) { @@ -780,6 +772,7 @@ test("headless_browsertests") { "//base", "//cc:test_support", "//components/devtools/simple_devtools_protocol_client", + "//components/headless/test", "//components/policy/core/browser", "//components/security_state/content", "//content/test:browsertest_support", diff --git a/headless/test/headless_command_browsertest.cc b/headless/test/headless_command_browsertest.cc index 85ac2209d4e897..653204b65a47e3 100644 --- a/headless/test/headless_command_browsertest.cc +++ b/headless/test/headless_command_browsertest.cc @@ -15,6 +15,8 @@ #include "build/build_config.h" #include "components/headless/command_handler/headless_command_handler.h" #include "components/headless/command_handler/headless_command_switches.h" +#include "components/headless/test/bitmap_utils.h" +#include "components/headless/test/capture_std_stream.h" #include "content/public/test/browser_test.h" #include "headless/lib/browser/headless_browser_context_impl.h" #include "headless/lib/browser/headless_browser_impl.h" @@ -22,8 +24,6 @@ #include "headless/public/headless_browser.h" #include "headless/public/headless_browser_context.h" #include "headless/public/headless_web_contents.h" -#include "headless/test/bitmap_utils.h" -#include "headless/test/capture_std_stream.h" #include "headless/test/headless_browser_test.h" #include "headless/test/headless_browser_test_utils.h" #include "net/test/embedded_test_server/embedded_test_server.h" @@ -38,7 +38,7 @@ #include "url/gurl.h" #if BUILDFLAG(ENABLE_PRINTING) && BUILDFLAG(ENABLE_PDF) -#include "headless/test/pdf_utils.h" +#include "components/headless/test/pdf_utils.h" #endif namespace headless { diff --git a/headless/test/headless_policy_browsertest.cc b/headless/test/headless_policy_browsertest.cc index 1dfa5970f71599..289772a7c3ad92 100644 --- a/headless/test/headless_policy_browsertest.cc +++ b/headless/test/headless_policy_browsertest.cc @@ -20,6 +20,7 @@ #include "base/threading/platform_thread.h" #include "base/threading/thread_restrictions.h" #include "build/build_config.h" +#include "components/headless/test/capture_std_stream.h" #include "components/policy/core/browser/browser_policy_connector_base.h" #include "components/policy/core/common/mock_configuration_policy_provider.h" #include "components/policy/core/common/policy_map.h" @@ -29,7 +30,6 @@ #include "headless/lib/browser/policy/headless_mode_policy.h" #include "headless/public/headless_browser.h" #include "headless/public/switches.h" -#include "headless/test/capture_std_stream.h" #include "headless/test/headless_browser_test.h" #include "headless/test/headless_browser_test_utils.h" #include "net/base/host_port_pair.h" diff --git a/headless/test/headless_printtopdf_browsertest.cc b/headless/test/headless_printtopdf_browsertest.cc index 3cf1613c775f99..a4cb501fd84a0c 100644 --- a/headless/test/headless_printtopdf_browsertest.cc +++ b/headless/test/headless_printtopdf_browsertest.cc @@ -15,12 +15,12 @@ #include "base/strings/string_piece.h" #include "base/test/values_test_util.h" #include "base/values.h" +#include "components/headless/test/pdf_utils.h" #include "content/public/test/browser_test.h" #include "headless/public/switches.h" #include "headless/test/headless_browser_test.h" #include "headless/test/headless_browser_test_utils.h" #include "headless/test/headless_devtooled_browsertest.h" -#include "headless/test/pdf_utils.h" #include "pdf/pdf.h" #include "printing/buildflags/buildflags.h" #include "printing/pdf_render_settings.h"