Revert "Componentize chrome/browser/rlz"

chrome/browser/BUILD.gn

Index: chrome/browser/BUILD.gn
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 43c90b3b0ad3e81a85392e347f29917c4af6c15d..353cc37d5d3b01c2222638626c32c9443ab45755 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -685,7 +685,9 @@ source_set("browser") {
   }
 
   if (enable_rlz) {
-    deps += [ ":rlz" ]
+    sources +=
+        rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome")
+    deps += [ "//rlz:rlz_lib" ]
   }
 
   # TODO(GYP)
@@ -1195,17 +1197,3 @@ source_set("test_support") {
     ]
   }
 }
-
-if (enable_rlz_support) {
-  source_set("rlz") {
-    sources =
-        rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome")
-    deps = [
-      "//components/google/core/browser",
-      "//components/omnibox/browser",
-      "//components/rlz",
-      "//components/search_engines",
-      "//rlz:rlz_lib",
-    ]
-  }
-}