Revert "Fix missing dependencies with RLZ target."

This reverts commit 22333d92.

Reason for revert: suspected of breakage in 'generate_build_files': https://bugs.chromium.org/p/chromium/issues/detail?id=870827#c3

Original change's description:
> Fix missing dependencies with RLZ target.
> 
> chrome_rlz_tracker_delegate.cc depended on browser_process.h which had transitive dependencies on generated mojoms. But it didn't get the public_deps because the rlz target didn't depend on chrome/browser to avoid circular dependencies. Fold it into chrome/browser to fix this properly.
> 
> This does mean that the one unit test in chrome_rlz_tracker_delegate_unittest.cc
>  will not run on chromium-branded bots anymore. That seems better than having flaky dependencies, since untangling the build dependencies looks like a lot of work.
> 
> Cq-Include-Trybots: luci.chromium.try:linux_chromium_dbg_ng
> Change-Id: I85d78d25b1905c68524e0636cec3006102d17749
> Reviewed-on: https://chromium-review.googlesource.com/1161610
> Reviewed-by: Avi Drissman <avi@chromium.org>
> Commit-Queue: John Abd-El-Malek <jam@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#580579}

TBR=avi@chromium.org,jam@chromium.org

Change-Id: I5bca5200d639f01dbba1ed582d9dccb3290cf0c4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Cq-Include-Trybots: luci.chromium.try:linux_chromium_dbg_ng
Reviewed-on: https://chromium-review.googlesource.com/1162211Reviewed-by: Roberto Carrillo <robertocn@chromium.org>
Commit-Queue: Roberto Carrillo <robertocn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580660}

build/check_gn_headers_whitelist.txt

@@ -60,6 +60,7 @@ chrome/browser/media_galleries/media_file_system_context.h
 chrome/browser/notifications/displayed_notifications_dispatch_callback.h
 chrome/browser/permissions/permission_queue_controller.h
 chrome/browser/prefs/active_profile_pref_service.h
+chrome/browser/rlz/chrome_rlz_tracker_delegate.h
 chrome/browser/ui/android/content_settings/subresource_filter_infobar_delegate.h
 chrome/browser/ui/app_icon_loader_delegate.h
 chrome/browser/ui/app_list/app_list_syncable_service_factory.h

chrome/browser/BUILD.gn

@@ -4081,16 +4081,7 @@ jumbo_split_static_library("browser") {
   }
 
   if (enable_rlz) {
-    sources += [
-      "rlz/chrome_rlz_tracker_delegate.cc",
-      "rlz/chrome_rlz_tracker_delegate.h",
-    ]
-
-    public_deps += [
-      "//components/google/core/browser",
-      "//components/rlz",
-      "//rlz:rlz_lib",
-    ]
+    deps += [ ":rlz" ]
   }
 
   if (enable_service_discovery) {
@@ -5144,3 +5135,19 @@ static_library("test_support_ui") {
     ]
   }
 }
+
+if (enable_rlz_support) {
+  static_library("rlz") {
+    sources = [
+      "rlz/chrome_rlz_tracker_delegate.cc",
+      "rlz/chrome_rlz_tracker_delegate.h",
+    ]
+    public_deps = [
+      "//components/google/core/browser",
+      "//components/omnibox/browser",
+      "//components/rlz",
+      "//components/search_engines",
+      "//rlz:rlz_lib",
+    ]
+  }
+}

chrome/browser/chromeos/BUILD.gn

@@ -56,6 +56,7 @@ source_set("chromeos") {
     "//cc/paint",
     "//chrome/app:command_ids",
     "//chrome/app/vector_icons",
+    "//chrome/browser:rlz",
     "//chrome/browser/apps/foundation/app_service:lib",
     "//chrome/browser/devtools",
     "//chrome/browser/extensions",
@@ -104,7 +105,6 @@ source_set("chromeos") {
     "//components/feedback",
     "//components/flags_ui",
     "//components/gcm_driver",
-    "//components/google/core/common:common",
     "//components/guest_view/browser",
     "//components/image_fetcher/core",
     "//components/invalidation/impl",
@@ -127,7 +127,6 @@ source_set("chromeos") {
     "//components/quirks",
     "//components/rappor",
     "//components/renderer_context_menu",
-    "//components/rlz",
     "//components/safe_browsing:csd_proto",
     "//components/safe_browsing/db:metadata_proto",
     "//components/session_manager/core",

chrome/test/BUILD.gn

@@ -4271,9 +4271,13 @@ test("unit_tests") {
   if (is_win || is_mac || is_chromeos) {
     sources += [ "../browser/extensions/api/networking_private/networking_private_crypto_unittest.cc" ]
   }
-  if (enable_rlz) {
+  if (enable_rlz_support) {
     sources += [ "../browser/rlz/chrome_rlz_tracker_delegate_unittest.cc" ]
-    deps += [ "//rlz:test_support" ]
+    deps += [
+      "//chrome/browser:rlz",
+      "//components/rlz",
+      "//rlz:test_support",
+    ]
   }
   if (is_win) {
     if (!is_component_build) {