Revert "Componentize chrome/browser/rlz"

build/config/features.gni

 # Copyright 2014 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.
 
 # This file contains Chrome-feature-related build flags (see ui.gni for
 # UI-related ones). These should theoretically be moved to the build files of
 # the features themselves.
 #
 # However, today we have many "bad" dependencies on some of these flags from,
 # e.g. base, so they need to be global to match the GYP configuration. Also,
@@ skipping 150 matching lines @@
 
 use_cups = is_desktop_linux || is_mac
 
 enable_themes = !is_android && !is_ios
 
 # TODO(scottmg) remove this when we've fixed printing.
 win_pdf_metafile_for_printing = true
 
 # 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 = is_win || is_mac || is_ios || is_chromeos
-enable_rlz = is_chrome_branded && enable_rlz_support
+enable_rlz = is_chrome_branded && (is_win || is_mac || is_ios || is_chromeos)
 
 enable_settings_app = enable_app_list && !is_chromeos
 
 enable_service_discovery = enable_mdns || is_mac
 
 enable_wifi_bootstrapping = is_win || is_mac
 
 # Image loader extension is enabled on ChromeOS only.
 enable_image_loader_extension = is_chromeos
 
@@ skipping 12 matching lines @@
 # Hangout services is an extension that adds extra features to Hangouts.
 # For official GYP builds, this flag is set, it will likely need to be
 # parameterized in the future for a similar use.
 enable_hangout_services_extension = false
 
 # Whether to back up data before sync.
 enable_pre_sync_backup = is_win || is_mac || (is_linux && !is_chromeos)
 
 # WebVR support disabled until platform implementations have been added
 enable_webvr = false