Componentize chrome/browser/rlz

chrome/chrome_tests_unit.gypi

Index: chrome/chrome_tests_unit.gypi
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index cd34a71b5af489c3d33b4e5ae506b65a3faaa223..a1a9eee12086d028770aedcaf15dd0531c1e007b 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -218,7 +218,6 @@
       'browser/renderer_context_menu/render_view_context_menu_test_util.h',
       'browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_unit_test.mm',
       'browser/resources_util_unittest.cc',
-      'browser/rlz/rlz_unittest.cc',
       'browser/search/contextual_search_policy_handler_android_unittest.cc',
       'browser/search/iframe_source_unittest.cc',
       'browser/search/instant_unittest_base.cc',
@@ -2562,13 +2561,14 @@
             'common/extensions/api/networking_private/networking_private_crypto_unittest.cc',
           ],
         }],
-        ['enable_rlz!=0', {
+        ['enable_rlz_support==1', {
+          'sources': [
+            'browser/rlz/chrome_rlz_tracker_delegate_unittest.cc',
+          ],
           'dependencies': [
+            '../components/components.gyp:rlz',
             '../rlz/rlz.gyp:test_support_rlz',
-          ],
-        }, {  # enable_rlz==0
-          'sources!': [
-            'browser/rlz/rlz_unittest.cc',
+            'browser_rlz',
           ],
         }],
         ['OS=="win" and component!="shared_library"', {