Revert "Componentize chrome/browser/rlz"

components/components_tests.gyp

 # 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.
 
 {
   'variables': {
     # This turns on e.g. the filename-based detection of which
     # platforms to include source files on (e.g. files ending in
     # _mac.h or _mac.cc are only compiled on MacOSX).
     'chromium_code': 1,
@@ skipping 470 matching lines @@
     'rappor_unittest_sources': [
       'rappor/bloom_filter_unittest.cc',
       'rappor/byte_vector_utils_unittest.cc',
       'rappor/log_uploader_unittest.cc',
       'rappor/rappor_metric_unittest.cc',
       'rappor/rappor_prefs_unittest.cc',
       'rappor/rappor_service_unittest.cc',
       'rappor/rappor_utils_unittest.cc',
       'rappor/sampler_unittest.cc',
     ],
-    'rlz_unittest_sources': [
-      'rlz/rlz_tracker_unittest.cc',
-    ],
     'scheduler_unittest_sources': [
       'scheduler/child/idle_helper_unittest.cc',
       'scheduler/child/nestable_task_runner_for_test.cc',
       'scheduler/child/nestable_task_runner_for_test.h',
       'scheduler/child/prioritizing_task_queue_selector_unittest.cc',
       'scheduler/child/scheduler_helper_unittest.cc',
       'scheduler/child/task_queue_manager_unittest.cc',
       'scheduler/child/test_time_source.cc',
       'scheduler/child/test_time_source.h',
       'scheduler/child/webthread_impl_for_worker_scheduler_unittest.cc',
@@ skipping 356 matching lines @@
         'components.gyp:variations_http_provider',
         'components.gyp:wallpaper',
         'components.gyp:web_resource',
         'components.gyp:web_resource_test_support',
         'components_resources.gyp:components_resources',
         'components_strings.gyp:components_strings',
         'components_tests_pak',
         'mime_util/mime_util.gyp:mime_util',
       ],
       'conditions': [
-        ['enable_rlz_support==1', {
-          'sources': [
-            '<@(rlz_unittest_sources)',
-          ],
-          'dependencies': [
-            '../net/net.gyp:net_test_support',
-            '../rlz/rlz.gyp:test_support_rlz',
-            'components.gyp:rlz',
-          ],
-          'conditions': [
-            ['OS == "ios"', {
-              'dependencies': [
-                '../ui/base/ui_base.gyp:ui_base',
-              ],
-            }],
-          ],
-        }],
         ['toolkit_views == 1', {
           'sources': [
             'bookmarks/browser/bookmark_node_data_unittest.cc',
             'constrained_window/constrained_window_views_unittest.cc',
           ],
           'dependencies': [
             '<(DEPTH)/ui/views/views.gyp:views',
             '<(DEPTH)/ui/views/views.gyp:views_test_support',
             'components.gyp:constrained_window',
           ]
@@ skipping 626 matching lines @@
           ],
           'variables': {
             'test_suite_name': 'components_unittests',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }