Move profiling_host files to the chrome/browser target.
The //chrome/browser depends on //chrome/browser/profiling_host, but the
profiling_host files have been accumulating barwards-pointing includes. Since
this is all a soup, adding the files to the main browser target is the best
approach.
Add some missing dependencies.
Remove an obsolete is_ios condition in chrome/browser. This file is not
used on iOS.
Change-Id: I4868cfe6be35537784950855a100a822d92ec13a
Reviewed-on: https://chromium-review.googlesource.com/655926
Commit-Queue: Brett Wilson <[email protected]>
Reviewed-by: Albert J. Wong <[email protected]>
Cr-Commit-Position: refs/heads/master@{#500424}diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index c7e54673..0878c70 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1179,6 +1179,12 @@
"profiles/sql_init_error_message_ids.cc",
"profiles/sql_init_error_message_ids.h",
"profiles/storage_partition_descriptor.h",
+ "profiling_host/background_profiling_triggers.cc",
+ "profiling_host/background_profiling_triggers.h",
+ "profiling_host/chrome_browser_main_extra_parts_profiling.cc",
+ "profiling_host/chrome_browser_main_extra_parts_profiling.h",
+ "profiling_host/profiling_process_host.cc",
+ "profiling_host/profiling_process_host.h",
"push_messaging/push_messaging_app_identifier.cc",
"push_messaging/push_messaging_app_identifier.h",
"push_messaging/push_messaging_constants.cc",
@@ -1490,13 +1496,6 @@
"win/titlebar_config.h",
]
- if (is_ios) {
- sources -= [
- "ssl/mitm_software_blocking_page.cc",
- "ssl/mitm_software_blocking_page.h",
- ]
- }
-
if (!is_android) {
sources += [
"embedded_ui_service_info_factory.cc",
@@ -1514,9 +1513,8 @@
allow_circular_includes_from = [ "//chrome/browser/ui" ]
- # iOS/non-iOS shared deps. New dependencies should generally be added in the
- # non-iOS deps below.
public_deps = [
+ "//base",
"//chrome/common",
"//components/autofill/core/browser",
"//components/payments/core",
@@ -1528,6 +1526,8 @@
deps = [
":active_use_util",
":resource_prefetch_predictor_proto",
+ "//base:i18n",
+ "//base/allocator:features",
"//cc",
"//chrome:extra_resources",
"//chrome:resources",
@@ -1541,7 +1541,6 @@
"//chrome/browser/metrics:expired_histograms_array",
"//chrome/browser/metrics/variations:chrome_ui_string_overrider_factory",
"//chrome/browser/net:probe_message_proto",
- "//chrome/browser/profiling_host",
"//chrome/browser/safe_browsing",
"//chrome/browser/ssl:proto",
"//chrome/browser/ui",
