Revert "Componentize chrome/browser/rlz"

chrome/chrome_tests_unit.gypi

 # Copyright 2012 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.
 {
   'variables': {
     'chrome_unit_tests_sources': [
       # histograms.xml is analyzed by AboutFlagsHistogramTest, so this
       # dependency is needed to make commit bots run unit_tests on
       # histograms.xml changes.
       '../tools/metrics/histograms/histograms.xml',
@@ skipping 197 matching lines @@
       'browser/profiles/profile_info_cache_unittest.cc',
       'browser/profiles/profile_info_cache_unittest.h',
       'browser/profiles/profile_manager_unittest.cc',
       'browser/profiles/profile_shortcut_manager_unittest_win.cc',
       'browser/push_messaging/push_messaging_app_identifier_unittest.cc',
       'browser/push_messaging/push_messaging_permission_context_unittest.cc',
       'browser/renderer_context_menu/render_view_context_menu_test_util.cc',
       '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',
       'browser/search/instant_unittest_base.h',
       'browser/search/most_visited_iframe_source_unittest.cc',
       'browser/search/search_android_unittest.cc',
       'browser/search_engines/search_provider_install_data_unittest.cc',
       'browser/service_process/service_process_control_mac_unittest.mm',
       'browser/services/gcm/fake_gcm_profile_service.cc',
       'browser/services/gcm/fake_gcm_profile_service.h',
@@ skipping 2324 matching lines @@
           ],
         }],
         ['OS=="win" or OS=="mac"', {
           'sources': [ '<@(chrome_unit_tests_win_mac_sources)' ],
         }],
         ['OS=="win" or OS=="mac" or chromeos==1', {
           'sources': [
             'common/extensions/api/networking_private/networking_private_crypto_unittest.cc',
           ],
         }],
-        ['enable_rlz_support==1', {
-          'sources': [
-            'browser/rlz/chrome_rlz_tracker_delegate_unittest.cc',
+        ['enable_rlz!=0', {
+          'dependencies': [
+            '../rlz/rlz.gyp:test_support_rlz',
           ],
-          'dependencies': [
-            '../components/components.gyp:rlz',
-            '../rlz/rlz.gyp:test_support_rlz',
-            'browser_rlz',
+        }, {  # enable_rlz==0
+          'sources!': [
+            'browser/rlz/rlz_unittest.cc',
           ],
         }],
         ['OS=="win" and component!="shared_library"', {
           # Unit_tests pdb files can get too big when incremental linking is
           # on, disabling for this target.
           'configurations': {
             'Debug': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_debug_link_nonincremental)',
@@ skipping 307 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }