0

[CodeHealth] Reduces GN checks error for //headless/*

This change is part of a code health effort to enable gn check for all
directories:
https://docs.google.com/document/d/1sGxV0nGGoavOuw6XodYQ9xiN1f8fIhrb32gwADr2cD4/

I think the most of rest of errors are from the dependencies of
headless_shared_sources over headless_no_renderer and
headless_renderer, which might require some refactoring. I am not the
most suitable person as the lack of the domain knowledge of
//headless/*.

Bug: 1349362
Change-Id: Id4ef24fd0ef44bd2f3edc4c9690cf222d637dcd6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3806001
Reviewed-by: Andrey Kosyakov <caseq@chromium.org>
Reviewed-by: Erik Staab <estaab@chromium.org>
Commit-Queue: William Liu <liuwilliam@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1032740}
This commit is contained in:
William Liu
2022-08-08 21:36:54 +00:00
committed by Chromium LUCI CQ
parent 8b0918ea90
commit 89fb2f63c1
7 changed files with 19 additions and 17 deletions

9
.gn

@ -68,11 +68,10 @@ default_args = {
# their includes checked for proper dependencies when you run either
# "gn check" or "gn gen --check".
no_check_targets = [
"//headless:headless_non_renderer", # 9 errors
"//headless:headless_renderer", # 13 errors
"//headless:headless_shared_sources", # 4 errors
"//headless:headless_shell_browser_lib", # 10 errors
"//headless:headless_shell_lib", # 10 errors
"//headless:headless_non_renderer", # 2 errors
"//headless:headless_renderer", # 12 errors
"//headless:headless_shared_sources", # 2 errors
"//headless:headless_shell_browser_lib", # 1 errors
# //v8, https://crbug.com/v8/7330
"//v8/src/inspector:inspector", # 20 errors

@ -379,6 +379,8 @@ component("headless_non_renderer") {
"lib/browser/headless_request_context_manager.h",
"lib/browser/headless_select_file_dialog_factory.cc",
"lib/browser/headless_select_file_dialog_factory.h",
"lib/browser/headless_web_contents_impl.cc",
"lib/browser/headless_web_contents_impl.h",
"lib/browser/headless_window_tree_host.h",
"lib/browser/protocol/browser_handler.cc",
"lib/browser/protocol/browser_handler.h",
@ -462,6 +464,7 @@ component("headless_non_renderer") {
"//components/cookie_config",
"//components/embedder_support",
"//components/keyed_service/content",
"//components/os_crypt:os_crypt",
"//components/policy:generated",
"//components/policy/core/browser",
"//components/policy/core/common:common_constants",
@ -491,6 +494,7 @@ component("headless_non_renderer") {
deps += [
"//components/printing/browser",
"//components/printing/browser/headless",
"//components/printing/browser/print_to_pdf:print_to_pdf",
"//components/printing/common:mojo_interfaces",
"//printing",
"//printing/mojom",
@ -501,8 +505,6 @@ component("headless_non_renderer") {
sources += [
"lib/browser/headless_content_browser_client.cc",
"lib/browser/headless_content_browser_client.h",
"lib/browser/headless_web_contents_impl.cc",
"lib/browser/headless_web_contents_impl.h",
"lib/headless_content_main_delegate.cc",
"lib/headless_content_main_delegate.h",
"lib/renderer/headless_content_renderer_client.cc",
@ -667,6 +669,7 @@ if (!is_component_build) {
}
if (enable_basic_printing) {
deps += [
"//components/printing/browser/headless:headless",
"//components/printing/renderer",
"//components/services/print_compositor",
"//components/services/print_compositor/public/mojom",
@ -901,6 +904,7 @@ if (is_win) {
deps = [
":headless_non_renderer",
"//build:branding_buildflags",
"//components/crash/core/app:app",
"//components/crash/core/app:run_as_crashpad_handler",
"//components/embedder_support",
"//content:sandbox_helper_win",
@ -914,6 +918,9 @@ if (is_win) {
if (headless_use_policy) {
deps += [ "//components/policy/content" ]
}
if (enable_basic_printing) {
deps += [ "//components/printing/browser/headless:headless" ]
}
configs += [ ":headless_defines_config" ]
}
}
@ -968,6 +975,7 @@ static_library("headless_shell_lib") {
if (enable_basic_printing) {
deps += [
"//components/printing/browser",
"//components/printing/browser/headless:headless",
"//components/printing/renderer",
"//components/services/print_compositor",
"//components/services/print_compositor/public/mojom",

@ -19,7 +19,6 @@
#include "content/public/browser/resource_context.h"
#include "headless/lib/browser/headless_browser_context_options.h"
#include "headless/lib/browser/headless_request_context_manager.h"
#include "headless/public/headless_browser.h"
#include "headless/public/headless_browser_context.h"
#include "headless/public/headless_export.h"
#include "mojo/public/cpp/bindings/remote.h"

@ -49,8 +49,8 @@
#include "ui/gfx/switches.h"
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
#include "components/crash/core/app/crash_switches.h"
#include "components/crash/core/app/crashpad.h"
#include "components/crash/core/app/crash_switches.h" // nogncheck
#include "components/crash/core/app/crashpad.h" // nogncheck
#include "content/public/common/content_descriptors.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)

@ -8,12 +8,10 @@
#include <memory>
#include <string>
#include "base/compiler_specific.h"
#include "build/build_config.h"
#include "content/public/app/content_main_delegate.h"
#include "content/public/browser/content_browser_client.h"
#include "content/public/renderer/content_renderer_client.h"
#include "headless/lib/browser/headless_platform_event_source.h"
#include "headless/lib/headless_content_client.h"
#include "headless/public/headless_browser.h"
#include "headless/public/headless_export.h"
@ -79,7 +77,6 @@ class HEADLESS_EXPORT HeadlessContentMainDelegate
std::unique_ptr<content::ContentBrowserClient> browser_client_;
std::unique_ptr<content::ContentUtilityClient> utility_client_;
HeadlessContentClient content_client_;
HeadlessPlatformEventSource platform_event_source_;
std::unique_ptr<HeadlessBrowserImpl> browser_;
std::unique_ptr<HeadlessBrowser::Options> options_;

@ -14,12 +14,9 @@
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/memory/raw_ptr.h"
#include "base/memory/ref_counted.h"
#include "build/build_config.h"
#include "headless/public/headless_browser_context.h"
#include "headless/public/headless_devtools_channel.h"
#include "headless/public/headless_export.h"
#include "headless/public/headless_web_contents.h"
#include "net/base/host_port_pair.h"
#include "ui/gfx/font_render_params.h"
#include "ui/gfx/geometry/size.h"
@ -35,6 +32,9 @@ class SingleThreadTaskRunner;
namespace headless {
class HeadlessDevToolsChannel;
class HeadlessWebContents;
// This class represents the global headless browser instance. To get a pointer
// to one, call |HeadlessBrowserMain| to initiate the browser main loop. An
// instance of |HeadlessBrowser| will be passed to the callback given to that

@ -12,7 +12,6 @@
#include "base/callback.h"
#include "base/memory/raw_ptr.h"
#include "content/public/browser/browser_context.h"
#include "headless/public/headless_export.h"
#include "headless/public/headless_web_contents.h"
#include "net/proxy_resolution/proxy_resolution_service.h"