Separate profile.{cc,h} (& observer) to its own GN target.

This allows other code to depend on profile.h (very common as it is a
keyed service key) without depending on all of //c/b:browser. This
improves modularization of the codebase and will help to break
dependency cycles in GN.

Bug: 1149277
Fixed: 1149277
Change-Id: Ib8a160dbcd29301490f9826278262980e34dbf9b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2542933Reviewed-by: David Roger <droger@chromium.org>
Commit-Queue: Glen Robertson <glenrob@chromium.org>
Cr-Commit-Position: refs/heads/master@{#844698}

chrome/browser/BUILD.gn

@@ -1449,8 +1449,6 @@ static_library("browser") {
     "profiles/off_the_record_profile_impl.h",
     "profiles/pref_service_builder_utils.cc",
     "profiles/pref_service_builder_utils.h",
-    "profiles/profile.cc",
-    "profiles/profile.h",
     "profiles/profile_attributes_entry.cc",
     "profiles/profile_attributes_entry.h",
     "profiles/profile_attributes_storage.cc",
@@ -1483,7 +1481,6 @@ static_library("browser") {
     "profiles/profile_manager_observer.h",
     "profiles/profile_metrics.cc",
     "profiles/profile_metrics.h",
-    "profiles/profile_observer.h",
     "profiles/profiles_state.cc",
     "profiles/profiles_state.h",
     "profiles/renderer_updater.cc",
@@ -1995,6 +1992,7 @@ static_library("browser") {
     "//chrome/browser/persisted_state_db:persisted_state_db_content_proto",
     "//chrome/browser/policy:path_parser",
     "//chrome/browser/privacy_budget",
+    "//chrome/browser/profiles:profile",
     "//chrome/browser/profiling_host",
     "//chrome/browser/promo_browser_command:mojo_bindings",
     "//chrome/browser/push_messaging:budget_proto",
@@ -5755,7 +5753,7 @@ static_library("browser") {
       "//chrome/browser/extensions",
       "//chrome/browser/web_applications",
 
-      # TODO(loyso): Erase these.crbug.com / 877898.
+      # TODO(crbug.com/877898): Erase these.
       "//chrome/browser/web_applications:web_applications_on_extensions",
       "//chrome/browser/web_applications/components",
       "//chrome/browser/web_applications/extensions",
@@ -6704,13 +6702,13 @@ static_library("test_support") {
 
   public_deps = [
     ":browser",
+    "//chrome/browser/profiles:profile",
     "//chrome/browser/safe_browsing:test_support",
     "//chrome/browser/ui:test_support",
   ]
   deps = [
     "//build:chromeos_buildflags",
     "//chrome/app/theme:theme_resources",
-    "//chrome/browser",
     "//chrome/browser:browser_process",
     "//chrome/common",
     "//chrome/common/safe_browsing:proto",
@@ -6979,6 +6977,7 @@ if (!is_android) {
       ":browser",
       "//chrome:browser_tests_pak",
       "//chrome/browser:browser_process",
+      "//chrome/browser/profiles:profile",
       "//chrome/common:mojo_bindings",
       "//chrome/test/data:web_ui_test_bindings",
       "//components/metrics:test_support",

chrome/browser/android/vr/BUILD.gn

@@ -67,6 +67,7 @@ static_library("vr_android") {
     "//cc",
     "//chrome/android/features/vr:jni_headers",
     "//chrome/browser:browser_process",
+    "//chrome/browser/profiles:profile",
     "//chrome/browser/ui",
     "//chrome/browser/vr:vr_common",
     "//chrome/common",

chrome/browser/apps/app_shim/BUILD.gn

@@ -25,6 +25,7 @@ source_set("app_shim") {
   deps = [
     "//apps",
     "//chrome/browser:browser_process",
+    "//chrome/browser/profiles:profile",
     "//chrome/browser/web_applications:web_applications",
     "//chrome/browser/web_applications/components",
     "//chrome/common",

chrome/browser/apps/platform_apps/BUILD.gn

@@ -55,6 +55,7 @@ source_set("platform_apps") {
     "//chrome/browser:browser_process",
     "//chrome/browser/extensions",
     "//chrome/browser/media/router/discovery",
+    "//chrome/browser/profiles:profile",
     "//chrome/browser/sharing/proto:proto",
     "//chrome/browser/web_applications/components:components",
     "//chrome/browser/web_applications/extensions",

chrome/browser/apps/platform_apps/api/BUILD.gn

@@ -53,6 +53,7 @@ source_set("api") {
     "//chrome/browser:browser_process",
     "//chrome/browser/apps/platform_apps/api/music_manager_private",
     "//chrome/browser/extensions",
+    "//chrome/browser/profiles:profile",
     "//chrome/common",
     "//chrome/common/apps/platform_apps",
     "//chrome/common/apps/platform_apps/api",

chrome/browser/chromeos/BUILD.gn

@@ -92,6 +92,7 @@ source_set("chromeos") {
     "//chrome/browser/extensions",
     "//chrome/browser/image_decoder",
     "//chrome/browser/nearby_sharing/logging",
+    "//chrome/browser/profiles:profile",
     "//chrome/browser/resource_coordinator:tab_metrics_event_proto",
     "//chrome/browser/resources/settings:settings_resources_grit",
     "//chrome/browser/ui/webui/bluetooth_internals:mojo_bindings",

chrome/browser/extensions/BUILD.gn

@@ -784,6 +784,7 @@ static_library("extensions") {
     "//chrome/browser/image_decoder",
     "//chrome/browser/media/router",
     "//chrome/browser/media/router/discovery",
+    "//chrome/browser/profiles:profile",
     "//chrome/browser/resource_coordinator:intervention_policy_database_proto",
     "//chrome/browser/resource_coordinator:mojo_bindings",
     "//chrome/browser/safe_browsing",

chrome/browser/profiles/BUILD.gn

@@ -2,6 +2,47 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/chromeos/ui_mode.gni")
+import("//extensions/buildflags/buildflags.gni")
+
+source_set("profile") {
+  sources = [
+    "profile.cc",
+    "profile.h",
+    "profile_observer.h",
+  ]
+
+  # Cannot depend on //chrome/browser:browser.
+  deps = [
+    "//base",
+    "//build:chromeos_buildflags",
+    "//chrome/browser/browsing_data:constants",
+    "//chrome/common:buildflags",
+    "//chrome/common:constants",
+    "//components/data_reduction_proxy/core/browser",
+    "//components/keyed_service/content",
+    "//components/language/core/browser",
+    "//components/media_router/common",
+    "//components/pref_registry",
+    "//components/sync/driver",
+    "//components/variations",
+    "//content/public/browser",
+    "//extensions/buildflags",
+  ]
+  if (enable_extensions) {
+    deps += [ "//extensions/browser" ]
+  }
+  if (is_chromeos_ash) {
+    deps += [ "//chromeos/constants" ]
+  }
+  if (is_chromeos_lacros) {
+    deps += [ "//chromeos/lacros" ]
+  }
+  if (is_android) {
+    deps += [ "//chrome/browser/profiles/android:jni_headers" ]
+  }
+}
+
 if (is_android) {
   import("//build/config/android/rules.gni")
 

chrome/browser/profiles/DEPS

@@ -4,18 +4,4 @@ specific_include_rules = {
     # is created.
     "+chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade_factory.h"
   ],
-  # TODO(crbug.com/1149277): Remove include rules for profile once it is in its
-  # own GN target. GN will prevent dependency cycles more reliably.
-  "profile\.(cc|h)": [
-    # Profile is a dependency for most of //chrome/browser for keyed services.
-    # It should not depend on anything in the //chrome/browser target.
-    "-chrome/browser",
-    "+chrome/browser/profiles/profile.h",
-    # Files without dependencies on //chrome/browser:
-    "+chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h",
-    "+chrome/browser/profiles/android/jni_headers",
-    "+chrome/browser/profiles/profile_observer.h",
-    # TODO(crbug.com/1149277): Remove this:
-    "+chrome/browser/first_run/first_run.h",
-  ]
 }

chrome/browser/safe_browsing/chrome_cleaner/BUILD.gn

@@ -59,6 +59,7 @@ static_library("chrome_cleaner") {
     ":public",
     "//chrome/browser:browser_process",
     "//chrome/browser/extensions",
+    "//chrome/browser/profiles:profile",
     "//chrome/browser/safe_browsing",
     "//chrome/browser/ui",
     "//chrome/common",

chrome/browser/supervised_user/BUILD.gn

@@ -21,6 +21,7 @@ static_library("test_support") {
   ]
   deps = [
     "//chrome/browser",
+    "//chrome/browser/profiles:profile",
     "//chrome/common:constants",
     "//components/prefs",
   ]

chrome/browser/ui/BUILD.gn

@@ -366,6 +366,7 @@ static_library("ui") {
     "//chrome/browser/image_decoder",
     "//chrome/browser/media:mojo_bindings",
     "//chrome/browser/media/feeds:mojo_bindings",
+    "//chrome/browser/profiles:profile",
     "//chrome/browser/profiling_host",
     "//chrome/browser/resources/invalidations:invalidations_resources",
     "//chrome/browser/resources/media:webrtc_logs_resources",
@@ -4724,6 +4725,7 @@ static_library("test_support") {
     "//chrome/app/theme:theme_resources",
     "//chrome/browser",
     "//chrome/browser/devtools",
+    "//chrome/browser/profiles:profile",
     "//components/omnibox/browser",
     "//components/password_manager/core/browser",
     "//components/payments/content",

chrome/browser/ui/ash/holding_space/BUILD.gn

@@ -22,6 +22,7 @@ source_set("browser_tests") {
     "//chrome/browser/chromeos",
     "//chrome/browser/chromeos:test_support",
     "//chrome/browser/extensions",
+    "//chrome/browser/profiles:profile",
     "//chrome/browser/ui",
     "//chrome/test:test_support_ui",
     "//chromeos/dbus/power:power",

chrome/browser/ui/webui/bluetooth_internals/BUILD.gn

@@ -18,6 +18,7 @@ source_set("bluetooth_internals") {
   deps = [
     ":mojo_bindings",
     "//build:chromeos_buildflags",
+    "//chrome/browser/profiles:profile",
     "//chrome/browser/resources/bluetooth_internals:resources",
     "//chrome/common",
     "//content/public/browser",

chrome/browser/web_applications/BUILD.gn

@@ -80,6 +80,7 @@ source_set("web_applications") {
     ":web_app_group",
     "//build:chromeos_buildflags",
     "//chrome/browser:browser_process",
+    "//chrome/browser/profiles:profile",
     "//chrome/browser/web_applications/components",
     "//chrome/browser/web_applications/preinstalled_web_apps",
     "//chrome/common",
@@ -184,6 +185,7 @@ source_set("web_applications_test_support") {
     "//base/test:test_support",
     "//chrome/app/theme:chrome_unscaled_resources_grit",
     "//chrome/browser",
+    "//chrome/browser/profiles:profile",
     "//chrome/browser/web_applications/components",
     "//components/crx_file:crx_file",
     "//components/sync:test_support_model",
@@ -309,6 +311,7 @@ source_set("web_applications_on_extensions") {
   deps = [
     ":web_app_group",
     ":web_applications",
+    "//chrome/browser/profiles:profile",
     "//chrome/browser/web_applications/components",
     "//chrome/browser/web_applications/extensions",
     "//chrome/common",
@@ -339,6 +342,7 @@ source_set("web_applications_on_extensions_test_support") {
     "//base",
     "//base/test:test_support",
     "//chrome/browser",
+    "//chrome/browser/profiles:profile",
     "//chrome/browser/web_applications/components",
     "//components/keyed_service/content",
     "//ui/webui",

chrome/browser/web_applications/components/BUILD.gn

@@ -143,6 +143,7 @@ source_set("components") {
     "//chrome/app/resources:platform_locale_settings",
     "//chrome/app/theme:chrome_unscaled_resources",
     "//chrome/browser:browser_process",
+    "//chrome/browser/profiles:profile",
     "//chrome/browser/web_applications:web_app_group",
     "//chrome/common",
     "//components/crx_file",
@@ -215,6 +216,7 @@ source_set("unit_tests") {
     "//base/test:test_support",
     "//build:chromeos_buildflags",
     "//chrome/app/theme:theme_resources",
+    "//chrome/browser/profiles:profile",
     "//chrome/browser/web_applications:web_app_test_group",
     "//chrome/browser/web_applications:web_applications",
     "//chrome/browser/web_applications:web_applications_test_support",
@@ -251,6 +253,7 @@ source_set("browser_tests") {
 
   deps = [
     ":components",
+    "//chrome/browser/profiles:profile",
     "//chrome/browser/web_applications:web_applications_test_support",
     "//chrome/test:test_support",
     "//chrome/test:test_support_ui",

chrome/browser/web_applications/extensions/BUILD.gn

@@ -38,8 +38,9 @@ source_set("extensions") {
 
   deps = [
     "//base",
-    "//chrome/browser:browser_process",
     "//build:chromeos_buildflags",
+    "//chrome/browser:browser_process",
+    "//chrome/browser/profiles:profile",
     "//chrome/browser/web_applications",
     "//chrome/browser/web_applications:web_app_group",
     "//chrome/browser/web_applications/components",