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 2537f62f8121c85fc07d76eae181f91f9c9fbfaf..959c3dbbec9154ec6b7581272d30b734618392ab 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -685,9 +685,7 @@ source_set("browser") {
   }
 
   if (enable_rlz) {
-    sources +=
-        rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome")
-    deps += [ "//rlz:rlz_lib" ]
+    deps += [ ":rlz" ]
   }
 
   # TODO(GYP)
@@ -1197,3 +1195,17 @@ 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",
+    ]
+  }
+}