Revert "Componentize chrome/browser/rlz"

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 7e5520ece21f4d430e7a55f70578242de13e19b5..e3c65ed66de16aa79b35155a3d473db4d0ccba8a 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1494,7 +1494,6 @@
 
     # Whether we are using the rlz library or not.  Platforms like Android send
     # rlz codes for searches but do not use the library.
-    'enable_rlz_support%': 0,
     'enable_rlz%': 0,
 
     # Turns on the i18n support in V8.
@@ -2321,15 +2320,9 @@
         'release_valgrind_build': 1,
       }],
 
-      # RLZ library is used on Win, Mac, iOS and ChromeOS.
-      ['OS=="win" or OS=="mac" or OS=="ios" or chromeos==1', {
-        'enable_rlz_support%': 1,
-        'conditions': [
-          # RLZ is enabled for "Chrome" builds.
-          ['branding=="Chrome"', {
-            'enable_rlz%': 1,
-          }],
-        ],
+      # Enable RLZ on Win, Mac, iOS and ChromeOS.
+      ['branding=="Chrome" and (OS=="win" or OS=="mac" or OS=="ios" or chromeos==1)', {
+        'enable_rlz%': 1,
       }],
 
       # Set default compiler flags depending on ARM version.