Revert "Componentize chrome/browser/rlz"

chrome/browser/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//third_party/protobuf/proto_library.gni")
 
@@ skipping 667 matching lines @@
       "DiskArbitration.framework",
       "IOKit.framework",
       "ImageCaptureCore.framework",
       "OpenGL.framework",
       "QuartzCore.framework",
       "SecurityInterface.framework",
     ]
   }
 
   if (enable_rlz) {
-    deps += [ ":rlz" ]
+    sources +=
+        rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome")
+    deps += [ "//rlz:rlz_lib" ]
   }
 
   # TODO(GYP)
   # Temporary fix to break the browser target into smaller chunks so it
   # will link with goma builds.
   #["OS=="win" and chromium_win_pch==0", {
   #  "msvs_shard": 4,
   #}],
 
   if (is_win) {
@@ skipping 489 matching lines @@
     ]
   }
 
   if (enable_wifi_bootstrapping) {
     sources += [
       "local_discovery/wifi/mock_wifi_manager.cc",
       "local_discovery/wifi/mock_wifi_manager.h",
     ]
   }
 }
-
-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",
-    ]
-  }
-}