Revert "Componentize chrome/browser/rlz"

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 9a22d16b350fe77866ef831d128066051745a72b..adb9765fe2358ebdf89b5510fa78a97e5ac76d4e 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2437,8 +2437,12 @@
       '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).
@@ -3712,8 +3716,9 @@
           },
         }],
         ['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
@@ -4082,24 +4087,5 @@
         },
       ],
     },],
-    ['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',
-          ],
-        },
-      ],
-    }],
   ],
 }