Revert "Componentize chrome/browser/rlz"

chrome/chrome_browser.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': {
     # All .cc, .h, .m, and .mm files under browser except for:
     # * tests and mocks.
     # * code below browser/chromeos
     # * code below browser/extensions
@@ skipping 2419 matching lines @@
       'browser/profiles/profile_metrics.cc',
       'browser/profiles/profile_metrics.h',
       'browser/profiles/profile_metrics_mac.mm',
       'browser/profiles/profile_shortcut_manager_win.cc',
       'browser/profiles/profile_shortcut_manager_win.h',
       'browser/profiles/profiles_state.cc',
       'browser/profiles/profiles_state.h',
       'browser/profiles/storage_partition_descriptor.h',
     ],
     'chrome_browser_rlz_sources': [
-      'browser/rlz/chrome_rlz_tracker_delegate.cc',
-      'browser/rlz/chrome_rlz_tracker_delegate.h',
+      'browser/rlz/rlz.cc',
+      'browser/rlz/rlz.h',
+      'browser/rlz/rlz_chromeos.cc',
+      'browser/rlz/rlz_ios.mm',
+      'browser/rlz/rlz_mac.cc',
+      'browser/rlz/rlz_win.cc',
     ],
     # "Safe Browsing Basic" files used for safe browsing in full mode
     # (safe_browsing=1), mobile (=2), and mobile-extended (=3).
     'chrome_browser_safe_browsing_basic_sources': [
       'browser/renderer_host/data_reduction_proxy_resource_throttle_android.cc',
       'browser/renderer_host/data_reduction_proxy_resource_throttle_android.h',
       'browser/renderer_host/safe_browsing_resource_throttle_factory.cc',
       'browser/renderer_host/safe_browsing_resource_throttle_factory.h',
       'browser/safe_browsing/malware_details.cc',
       'browser/safe_browsing/malware_details.h',
@@ skipping 1253 matching lines @@
               '$(SDKROOT)/System/Library/Frameworks/DiskArbitration.framework',
               '$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
               '$(SDKROOT)/System/Library/Frameworks/ImageCaptureCore.framework',
               '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
               '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
               '$(SDKROOT)/System/Library/Frameworks/SecurityInterface.framework',
             ],
           },
         }],
         ['enable_rlz==1', {
+          'sources': [ '<@(chrome_browser_rlz_sources)' ],
           'dependencies': [
-            'browser_rlz',
+            '../rlz/rlz.gyp:rlz_lib',
           ],
         }],
         # 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,
         }],
         ['OS=="win"', {
           'sources': [ '<@(chrome_browser_win_sources)' ],
           'include_dirs': [
@@ skipping 348 matching lines @@
             'browser/sync_file_system/drive_backend/metadata_database.proto',
           ],
           'variables': {
             'proto_in_dir': 'browser/sync_file_system/drive_backend',
             'proto_out_dir': 'chrome/browser/sync_file_system/drive_backend',
           },
           'includes': [ '../build/protoc.gypi' ]
         },
       ],
     },],
-    ['enable_rlz_support==1', {
-      'targets': [
-        {
-          # GN version: // chrome/browser:rlz
-          'target_name': 'browser_rlz',
-          'type': 'static_library',
-          'sources': [
-            '<@(chrome_browser_rlz_sources)',
-          ],
-          'dependencies': [
-            '../components/components.gyp:google_core_browser',
-            '../components/components.gyp:omnibox_browser',
-            '../components/components.gyp:rlz',
-            '../components/components.gyp:search_engines',
-            '../rlz/rlz.gyp:rlz_lib',
-          ],
-        },
-      ],
-    }],
   ],
 }