0

Revert "Enable gn check on //chrome/browser."

This reverts commit 93d899e275.

Reason for revert: Breaks on official build due to inclusion of 
//chromeos/components/telemetry*

Original change's description:
> Enable `gn check` on //chrome/browser.
> 
> Changes are:
> - adding deps when missing.
> - adding "nogncheck" when needed (see below explanation).
> - deleting nonexistent files from sources.
> - new target :net_dns_access for files that depend on
>   //net/dns:host_resolver (which has restricted visibility).
>   Alternative: could open visibility to all of //chrome/browser instead
>   of adding a new target that has visibility.
> - moving //c/b:test_support sources to //c/b/chromeos:test_support or
>   //c/test:test_support when they depended on headers there (cannot
>   add a dependency, there is a cycle).
> - moving includes to conditional sections when they are used only in
>   conditional sections (where it caused deps issues).
> - removing unused includes of test code from non-test code.
> - merging sections in //c/b/BUILD.gn that had the same if() conditions.
>   Alternative: revert these changes, they are cosmetic.
> - adding some asserts/conditional blocks in build files that only work
>   under those conditions.
> 
> "gn check" does not understand #if statements in cc/h files so it
> complains about missing deps in configurations where those deps were
> never actually included. "nogncheck" has been added to the include lines
> to suppress these spurious errors where necessary (sometimes it is not
> necessary because the include is used outside of #if statements in other
> files).
> 
> Bug: 898837, 1125897
> Change-Id: I77e7dd3780fb93edb2b555a82b681a870990b496
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2383400
> Reviewed-by: Dominick Ng <dominickn@chromium.org>
> Reviewed-by: Eric Orth <ericorth@chromium.org>
> Reviewed-by: Colin Blundell <blundell@chromium.org>
> Reviewed-by: Dirk Pranke <dpranke@google.com>
> Commit-Queue: Glen Robertson <glenrob@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#807321}

TBR=dpranke@google.com,blundell@chromium.org,dominickn@chromium.org,ericorth@chromium.org,glenrob@chromium.org

Change-Id: I13f4705899734213dd3f82fe60ac431f85584e70
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 898837
Bug: 1125897
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2413370
Reviewed-by: Glen Robertson <glenrob@chromium.org>
Commit-Queue: Glen Robertson <glenrob@chromium.org>
Cr-Commit-Position: refs/heads/master@{#807339}
This commit is contained in:
Glen Robertson
2020-09-16 04:49:23 +00:00
committed by Commit Bot
parent 12dbe14f7e
commit 6f973449da
31 changed files with 147 additions and 419 deletions

1
.gn

@ -71,6 +71,7 @@ no_check_targets = [
"//chrome/browser/updates/announcement_notification:*", # 15 errors
"//chrome/browser/updates/internal:*", # 8 errors
"//chrome/browser/updates:*", # 21 errors
"//chrome/browser:*", # 780 errors
"//chrome/child:*", # 3 errors
"//chrome/install_static:*", # 4 errors
"//chrome/notification_helper:*", # 4 errors

File diff suppressed because it is too large Load Diff

@ -135,7 +135,7 @@
#include "chrome/browser/android/search_permissions/search_permissions_service.h"
#include "chrome/browser/android/webapps/webapp_registry.h"
#include "chrome/browser/offline_pages/offline_page_model_factory.h"
#include "components/cdm/browser/media_drm_storage_impl.h" // nogncheck crbug.com/1125897
#include "components/cdm/browser/media_drm_storage_impl.h"
#include "components/feed/buildflags.h"
#include "components/feed/core/v2/public/feed_service.h"
#include "components/feed/feed_feature_list.h"

@ -28,7 +28,7 @@
#include "url/origin.h"
#if defined(OS_ANDROID)
#include "components/cdm/browser/media_drm_storage_impl.h" // nogncheck crbug.com/1125897
#include "components/cdm/browser/media_drm_storage_impl.h"
#endif
using content::BrowserThread;

@ -118,6 +118,9 @@
#include "chrome/browser/ui/webui/downloads/downloads.mojom.h"
#include "chrome/browser/ui/webui/downloads/downloads_ui.h"
#include "chrome/browser/ui/webui/media/media_feeds_ui.h"
#include "chrome/browser/ui/webui/nearby_share/nearby_share.mojom.h"
#include "chrome/browser/ui/webui/nearby_share/nearby_share_dialog_ui.h"
#include "chrome/browser/ui/webui/nearby_share/public/mojom/nearby_share_settings.mojom.h"
#include "chrome/browser/ui/webui/new_tab_page/new_tab_page.mojom.h"
#include "chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.h"
#include "chrome/browser/ui/webui/read_later/read_later.mojom.h"
@ -161,9 +164,6 @@
#include "chrome/browser/ui/webui/chromeos/multidevice_setup/multidevice_setup_dialog.h"
#include "chrome/browser/ui/webui/chromeos/network_ui.h"
#include "chrome/browser/ui/webui/internals/web_app/web_app_internals.mojom.h"
#include "chrome/browser/ui/webui/nearby_share/nearby_share.mojom.h"
#include "chrome/browser/ui/webui/nearby_share/nearby_share_dialog_ui.h"
#include "chrome/browser/ui/webui/nearby_share/public/mojom/nearby_share_settings.mojom.h" // nogncheck crbug.com/1125897
#include "chrome/browser/ui/webui/settings/chromeos/os_settings_ui.h"
#include "chrome/browser/ui/webui/settings/chromeos/search/search.mojom.h"
#include "chrome/browser/ui/webui/settings/chromeos/search/user_action_recorder.mojom.h"

@ -291,7 +291,7 @@
#if BUILDFLAG(ENABLE_RLZ)
#include "chrome/browser/rlz/chrome_rlz_tracker_delegate.h"
#include "components/rlz/rlz_tracker.h" // nogncheck crbug.com/1125897
#include "components/rlz/rlz_tracker.h"
#endif // BUILDFLAG(ENABLE_RLZ)
#if BUILDFLAG(IS_LACROS)

@ -115,6 +115,8 @@
#include "chrome/browser/resource_coordinator/background_tab_navigation_throttle.h"
#include "chrome/browser/safe_browsing/certificate_reporting_service.h"
#include "chrome/browser/safe_browsing/certificate_reporting_service_factory.h"
#include "chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.h"
#include "chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service_factory.h"
#include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.h"
#include "chrome/browser/safe_browsing/delayed_warning_navigation_throttle.h"
#include "chrome/browser/safe_browsing/safe_browsing_navigation_throttle.h"
@ -471,7 +473,7 @@
#include "chrome/browser/webauthn/authenticator_request_scheduler.h"
#include "chrome/browser/webauthn/chrome_authenticator_request_delegate.h"
#include "chrome/common/importer/profile_import.mojom.h"
#include "chrome/grit/chrome_unscaled_resources.h" // nogncheck crbug.com/1125897
#include "chrome/grit/chrome_unscaled_resources.h"
#endif // !defined(OS_ANDROID)
#if defined(OS_WIN) || defined(OS_MAC) || \
@ -607,18 +609,13 @@
#include "chrome/browser/safe_browsing/client_side_detection_service_factory.h"
#endif
#if BUILDFLAG(SAFE_BROWSING_DB_LOCAL)
#include "chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.h" // nogncheck crbug.com/1125897
#include "chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service_factory.h" // nogncheck crbug.com/1125897
#endif
#if BUILDFLAG(ENABLE_OFFLINE_PAGES)
#include "chrome/browser/offline_pages/offline_page_tab_helper.h"
#include "chrome/browser/offline_pages/offline_page_url_loader_request_interceptor.h"
#endif
#if BUILDFLAG(ENABLE_VR) && !defined(OS_ANDROID)
#include "device/vr/public/mojom/isolated_xr_service.mojom.h" // nogncheck crbug.com/1125897
#include "device/vr/public/mojom/isolated_xr_service.mojom.h"
#endif
#if BUILDFLAG(ENABLE_WEBUI_TAB_STRIP)

@ -2961,14 +2961,6 @@ static_library("test_support") {
"login/screens/recommend_apps/fake_recommend_apps_fetcher_delegate.h",
"login/test/dialog_window_waiter.cc",
"login/test/dialog_window_waiter.h",
"login/test/js_checker.cc",
"login/test/js_checker.h",
"login/test/oobe_auth_page_waiter.cc",
"login/test/oobe_auth_page_waiter.h",
"login/test/oobe_screen_exit_waiter.cc",
"login/test/oobe_screen_exit_waiter.h",
"login/test/oobe_screen_waiter.cc",
"login/test/oobe_screen_waiter.h",
"login/test/scoped_help_app_for_test.cc",
"login/test/scoped_help_app_for_test.h",
"login/test/test_condition_waiter.h",

@ -28,7 +28,7 @@
#include "sql/database.h"
#include "sql/statement.h"
#include "storage/browser/database/database_tracker.h"
#include "third_party/sqlite/sqlite3.h" // nogncheck crbug.com/1126800
#include "third_party/sqlite/sqlite3.h"
#if defined(OS_CHROMEOS)
#include "chromeos/constants/chromeos_constants.h"

@ -37,7 +37,7 @@
#include "url/gurl.h"
#if BUILDFLAG(ENABLE_RLZ)
#include "rlz/lib/machine_id.h" // nogncheck crbug.com/1125897
#include "rlz/lib/machine_id.h"
#endif
namespace {

@ -67,7 +67,7 @@
#endif
#if BUILDFLAG(ENABLE_RLZ)
#include "components/rlz/rlz_tracker.h" // nogncheck crbug.com/1125897
#include "components/rlz/rlz_tracker.h"
#endif
#if BUILDFLAG(CLANG_PROFILING_INSIDE_SANDBOX)

@ -19,7 +19,7 @@
#include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
#if defined(OS_ANDROID)
#include "services/proxy_resolver/proxy_resolver_factory_impl.h" // nogncheck crbug.com/1125897
#include "services/proxy_resolver/proxy_resolver_factory_impl.h"
#else
#include "content/public/browser/service_process_host.h"
#include "services/strings/grit/services_strings.h"

@ -126,7 +126,7 @@
#include "chromeos/dbus/power/power_policy_controller.h"
#include "chromeos/services/multidevice_setup/public/cpp/prefs.h"
#include "components/arc/arc_prefs.h"
#include "components/drive/drive_pref_names.h" // nogncheck crbug.com/1125897
#include "components/drive/drive_pref_names.h"
#include "components/user_manager/user.h"
#include "components/user_manager/user_manager.h"
#else // defined(OS_CHROMEOS)

@ -4,11 +4,10 @@
#include "chrome/browser/policy/messaging_layer/encryption/encryption_module.h"
#include "base/bind.h"
#include "base/callback.h"
#include "base/feature_list.h"
#include "base/strings/string_piece.h"
#include "base/task/thread_pool.h"
#include "base/test/task_environment.h"
#include "chrome/browser/policy/messaging_layer/util/status.h"
#include "chrome/browser/policy/messaging_layer/util/statusor.h"
#include "components/policy/proto/record.pb.h"

@ -222,7 +222,7 @@
#include "chrome/browser/first_run/android/first_run_prefs.h"
#include "chrome/browser/media/android/cdm/media_drm_origin_id_manager.h"
#include "chrome/browser/ssl/known_interception_disclosure_infobar_delegate.h"
#include "components/cdm/browser/media_drm_storage_impl.h" // nogncheck crbug.com/1125897
#include "components/cdm/browser/media_drm_storage_impl.h"
#include "components/feed/buildflags.h"
#include "components/feed/core/shared_prefs/pref_names.h"
#include "components/games/core/games_prefs.h"

@ -77,7 +77,7 @@
#if defined(OS_WIN)
#include "base/enterprise_util.h"
#if BUILDFLAG(ENABLE_RLZ)
#include "rlz/lib/machine_id.h" // nogncheck crbug.com/1125897
#include "rlz/lib/machine_id.h"
#endif // BUILDFLAG(ENABLE_RLZ)
#endif // defined(OS_WIN)

@ -40,7 +40,7 @@
#endif
#if !defined(OS_ANDROID)
#include "chrome/browser/themes/theme_properties.h" // nogncheck crbug.com/1125897
#include "chrome/browser/themes/theme_properties.h"
#include "chrome/browser/ui/signin/profile_colors_util.h"
#endif

@ -44,7 +44,7 @@
#if defined(OS_WIN)
#include "chrome/browser/profiles/profile_attributes_entry.h"
#include "chrome/grit/chrome_unscaled_resources.h" // nogncheck crbug.com/1125897
#include "chrome/grit/chrome_unscaled_resources.h"
#include "ui/gfx/icon_util.h" // For Iconutil::kLargeIconSize.
#endif

@ -30,7 +30,7 @@
#endif
#if BUILDFLAG(ENABLE_RLZ)
#include "rlz/lib/machine_id.h" // nogncheck crbug.com/1125897
#include "rlz/lib/machine_id.h"
#endif
using content::BrowserPpapiHost;

@ -6,6 +6,7 @@
#include "base/feature_list.h"
#include "chrome/browser/reputation/local_heuristics.h"
#include "chrome/browser/reputation/safety_tip_test_utils.h"
#include "chrome/browser/reputation/safety_tips_config.h"
#include "components/lookalikes/core/lookalike_url_util.h"
#include "components/omnibox/common/omnibox_features.h"

@ -15,8 +15,6 @@ static_library("safe_browsing") {
"url_checker_delegate_impl.h",
]
public_deps = []
deps = [
"//chrome/app:generated_resources",
"//chrome/common",
@ -243,12 +241,10 @@ static_library("safe_browsing") {
"signature_evaluator_mac.h",
"signature_evaluator_mac.mm",
]
public_deps += [
":chrome_enterprise_url_lookup_service",
":chrome_enterprise_url_lookup_service_factory",
]
deps += [
":advanced_protection",
":chrome_enterprise_url_lookup_service",
":chrome_enterprise_url_lookup_service_factory",
"//chrome/common/safe_browsing:archive_analyzer_results",
"//chrome/common/safe_browsing:binary_feature_extractor",
"//chrome/common/safe_browsing:disk_image_type_sniffer_mac",
@ -284,43 +280,37 @@ static_library("safe_browsing") {
}
}
if (safe_browsing_mode == 1) {
source_set("chrome_enterprise_url_lookup_service_factory") {
visibility = [ ":*" ]
source_set("chrome_enterprise_url_lookup_service_factory") {
sources = [
"chrome_enterprise_url_lookup_service_factory.cc",
"chrome_enterprise_url_lookup_service_factory.h",
]
sources = [
"chrome_enterprise_url_lookup_service_factory.cc",
"chrome_enterprise_url_lookup_service_factory.h",
]
deps = [
":chrome_enterprise_url_lookup_service",
":verdict_cache_manager_factory",
"//chrome/common",
"//components/keyed_service/content",
"//content/public/browser",
]
}
deps = [
":chrome_enterprise_url_lookup_service",
":verdict_cache_manager_factory",
"//chrome/common",
"//components/keyed_service/content",
"//content/public/browser",
]
}
source_set("chrome_enterprise_url_lookup_service") {
sources = [
"chrome_enterprise_url_lookup_service.cc",
"chrome_enterprise_url_lookup_service.h",
]
source_set("chrome_enterprise_url_lookup_service") {
visibility = [ ":*" ]
sources = [
"chrome_enterprise_url_lookup_service.cc",
"chrome_enterprise_url_lookup_service.h",
]
deps = [
"//components/prefs",
"//components/safe_browsing/core:csd_proto",
"//components/safe_browsing/core:realtimeapi_proto",
"//components/safe_browsing/core:verdict_cache_manager",
"//components/safe_browsing/core/realtime:policy_engine",
"//components/safe_browsing/core/realtime:url_lookup_service_base",
"//components/sync",
"//services/network/public/cpp:cpp",
]
}
deps = [
"//components/prefs",
"//components/safe_browsing/core:csd_proto",
"//components/safe_browsing/core:realtimeapi_proto",
"//components/safe_browsing/core:verdict_cache_manager",
"//components/safe_browsing/core/realtime:policy_engine",
"//components/safe_browsing/core/realtime:url_lookup_service_base",
"//components/sync",
"//services/network/public/cpp:cpp",
]
}
source_set("url_lookup_service_factory") {

@ -24,7 +24,7 @@
#include "rlz/buildflags/buildflags.h"
#if BUILDFLAG(ENABLE_RLZ)
#include "components/rlz/rlz_tracker.h" // nogncheck crbug.com/1125897
#include "components/rlz/rlz_tracker.h"
#endif
// static

@ -20,7 +20,7 @@
#include "url/gurl.h"
#if BUILDFLAG(ENABLE_RLZ)
#include "components/rlz/rlz_tracker.h" // nogncheck crbug.com/1125897
#include "components/rlz/rlz_tracker.h"
#endif
using content::BrowserThread;

@ -40,7 +40,7 @@
#if !defined(OS_ANDROID)
#include "base/files/memory_mapped_file.h"
#include "third_party/hunspell/google/bdict.h" // nogncheck crbug.com/1125897
#include "third_party/hunspell/google/bdict.h"
#endif
using content::BrowserThread;

@ -7,7 +7,7 @@
#include "chrome/browser/task_manager/task_manager_observer.h"
#include "chrome/grit/generated_resources.h"
#include "chrome/grit/theme_resources.h"
#include "third_party/sqlite/sqlite3.h" // nogncheck crbug.com/1126800
#include "third_party/sqlite/sqlite3.h"
#include "ui/base/l10n/l10n_util.h"
namespace task_manager {

@ -1541,7 +1541,6 @@ static_library("ui") {
"//components/network_session_configurator/common",
"//components/page_load_metrics/browser",
"//components/performance_manager:site_data_proto",
"//components/printing/browser",
"//components/profile_metrics",
"//components/safety_check",
"//components/search_provider_logos",

@ -68,10 +68,7 @@ if (is_android) {
}
generate_jni("jni_headers") {
visibility = [
":*",
"//chrome/browser",
]
visibility = [ ":*" ]
sources = [
"android/java/src/org/chromium/chrome/browser/video_tutorials/VideoTutorialServiceFactory.java",

@ -86,17 +86,14 @@ static_library("with_no_strings") {
"shell_util.h",
]
public_deps += [
":did_run_support",
public_deps += [ ":did_run_support" ]
deps += [
# Need to depend on the generated strings target since files here
# depend on the generated header, but only depend on the ":strings"
# target (which actually compiles and causes the generated code to be
# linked) from the ":util" target.
":generate_strings",
]
deps += [
"//base:i18n",
"//base/third_party/dynamic_annotations",
"//build:branding_buildflags",

@ -113,16 +113,8 @@ static_library("test_support") {
sources = [
"../browser/autofill/automated_tests/cache_replayer.cc",
"../browser/autofill/automated_tests/cache_replayer.h",
"../browser/notifications/notification_display_service_tester.cc",
"../browser/notifications/notification_display_service_tester.h",
"../browser/permissions/crowd_deny_fake_safe_browsing_database_manager.cc",
"../browser/permissions/crowd_deny_fake_safe_browsing_database_manager.h",
"../browser/search_engines/template_url_service_factory_test_util.cc",
"../browser/search_engines/template_url_service_factory_test_util.h",
"../browser/search_engines/template_url_service_test_util.cc",
"../browser/search_engines/template_url_service_test_util.h",
"../browser/signin/identity_test_environment_profile_adaptor.cc",
"../browser/signin/identity_test_environment_profile_adaptor.h",
"base/chrome_render_view_host_test_harness.cc",
"base/chrome_render_view_host_test_harness.h",
"base/chrome_test_launcher.cc",
@ -326,12 +318,8 @@ static_library("test_support") {
"../browser/chromeos/arc/tracing/arc_app_performance_tracing_test_helper.h",
"../browser/chromeos/file_manager/file_manager_test_util.cc",
"../browser/chromeos/file_manager/file_manager_test_util.h",
"../browser/chromeos/login/users/fake_chrome_user_manager.cc",
"../browser/chromeos/login/users/fake_chrome_user_manager.h",
"../browser/chromeos/ownership/fake_owner_settings_service.cc",
"../browser/chromeos/ownership/fake_owner_settings_service.h",
"../browser/chromeos/settings/device_settings_test_helper.cc",
"../browser/chromeos/settings/device_settings_test_helper.h",
"../browser/chromeos/settings/scoped_cros_settings_test_helper.cc",
"../browser/chromeos/settings/scoped_cros_settings_test_helper.h",
"../browser/component_updater/fake_cros_component_manager.cc",
@ -360,11 +348,6 @@ static_library("test_support") {
"//ui/aura:test_support",
"//ui/base/ime/init",
]
deps += [
"//chromeos/cryptohome",
"//chromeos/dbus",
"//chromeos/dbus/power",
]
}
if (is_win || is_mac || (is_linux && !is_chromeos)) {
@ -415,10 +398,6 @@ static_library("test_support") {
"../browser/extensions/extension_browsertest.h",
"../browser/extensions/permissions_test_util.cc",
"../browser/extensions/permissions_test_util.h",
"../browser/extensions/test_extension_environment.cc",
"../browser/extensions/test_extension_environment.h",
"../browser/extensions/test_extension_prefs.cc",
"../browser/extensions/test_extension_prefs.h",
"../browser/ui/web_applications/test/ssl_test_utils.cc",
"../browser/ui/web_applications/test/ssl_test_utils.h",
"../browser/ui/web_applications/test/web_app_browsertest_util.cc",
@ -5908,20 +5887,12 @@ if (!is_android) {
testonly = true
sources = [
"../browser/interstitials/security_interstitial_idn_test.cc",
"../browser/interstitials/security_interstitial_idn_test.h",
"../browser/password_manager/password_manager_test_base.cc",
"../browser/password_manager/password_manager_test_base.h",
"../browser/ssl/cert_verifier_browser_test.cc",
"../browser/ssl/cert_verifier_browser_test.h",
"../browser/ssl/cert_verifier_platform_browser_test.cc",
"../browser/ssl/cert_verifier_platform_browser_test.h",
"../browser/ui/search/instant_test_utils.cc",
"../browser/ui/search/instant_test_utils.h",
"../browser/ui/search/local_ntp_test_utils.cc",
"../browser/ui/search/local_ntp_test_utils.h",
"../browser/ui/webui/signin/login_ui_test_utils.cc",
"../browser/ui/webui/signin/login_ui_test_utils.h",
"../browser/web_applications/test/profile_test_helper.cc",
"../browser/web_applications/test/profile_test_helper.h",
"base/in_process_browser_test.cc",

@ -50,7 +50,6 @@ static_library("search_engines") {
]
public_deps = [
":prepopulated_engines",
":search_engine_type",
"//base",
"//components/google/core/common",
@ -62,6 +61,7 @@ static_library("search_engines") {
]
deps = [
":prepopulated_engines",
"//base:i18n",
"//components/country_codes",
"//components/database_utils",

@ -182,11 +182,6 @@ source_set("host_resolver") {
# Restricted access so we can keep track of all usage external to the
# network stack and network service.
friend = [
# DNS Config and Overrides for Chrome browser.
# TODO (ericorth): Make DnsConfig(Overrides) public so //chrome/browser does
# not need to depend on host_resolver.
"//chrome/browser",
# chromecast/browser/url_request_context_factory.cc
# URLRequestContext creation for chromecast.
"//chromecast/browser",