Revert "Componentize chrome/browser/rlz"

chrome/test/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("//chrome/test/base/js2gtest.gni")
 import("//testing/test.gni")
@@ skipping 1521 matching lines @@
       ]
     }
     if (is_win || is_mac) {
       sources += rebase_path(unit_gypi_values.chrome_unit_tests_win_mac_sources,
                              ".",
                              "//chrome")
     }
     if (is_win || is_mac || is_chromeos) {
       sources += [ "../common/extensions/api/networking_private/networking_private_crypto_unittest.cc" ]
     }
-    if (enable_rlz_support) {
-      sources += [ "../browser/rlz/chrome_rlz_tracker_delegate_unittest.cc" ]
-      deps += [
-        "//chrome/browser:rlz",
-        "//components/rlz",
-        "//rlz:test_support",
-      ]
+    if (enable_rlz) {
+      deps += [ "//rlz:test_support" ]
+    } else {
+      sources -= [ "../browser/rlz/rlz_unittest.cc" ]
     }
     if (is_win) {
       if (!is_component_build) {
         # Unit_tests pdb files can get too big when incremental linking is
         # on, disabling for this target.
         #'LinkIncremental': '<(msvs_debug_link_nonincremental)',  TODO(GYP)
       }
 
       sources += rebase_path(unit_gypi_values.chrome_unit_tests_win_sources,
                              ".",
@@ skipping 191 matching lines @@
     "//third_party/mojo/src/mojo/edk/system",
   ]
 
   if (!is_android && use_ash) {
     sources +=
         rebase_path(unit_gypi_values.chrome_test_support_unit_ash_sources,
                     ".",
                     "//chrome")
   }
 }