Merge MetricsLog and MetricsLogBase.

components/components_tests.gyp

 # 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': {
     # 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 91 matching lines @@
             'gcm_driver/gcm_driver_desktop_unittest.cc',
             'invalidation/invalidation_logger_unittest.cc',
             'json_schema/json_schema_validator_unittest.cc',
             'json_schema/json_schema_validator_unittest_base.cc',
             'json_schema/json_schema_validator_unittest_base.h',
             'keyed_service/content/browser_context_dependency_manager_unittest.cc',
             'keyed_service/core/dependency_graph_unittest.cc',
             'language_usage_metrics/language_usage_metrics_unittest.cc',
             'metrics/machine_id_provider_win_unittest.cc',
             'metrics/metrics_hashes_unittest.cc',
-            'metrics/metrics_log_base_unittest.cc',
             'metrics/metrics_log_manager_unittest.cc',
+            'metrics/metrics_log_unittest.cc',
             'metrics/metrics_reporting_scheduler_unittest.cc',
             'metrics/metrics_state_manager_unittest.cc',
             'metrics/net/compression_utils_unittest.cc',
             'metrics/persisted_logs_unittest.cc',
             'navigation_interception/intercept_navigation_resource_throttle_unittest.cc',
             'network_time/network_time_tracker_unittest.cc',
             'os_crypt/ie7_password_win_unittest.cc',
             'os_crypt/keychain_password_mac_unittest.mm',
             'os_crypt/os_crypt_unittest.cc',
             'password_manager/core/browser/browser_save_password_progress_logger_unittest.cc',
@@ skipping 140 matching lines @@
 
             # Dependencies of keyed_service
             'components.gyp:keyed_service_core',
 
             # Dependencies of language_usage_metrics
             'components.gyp:language_usage_metrics',
 
             # Dependencies of metrics
             'components.gyp:metrics',
             'components.gyp:metrics_net',
+            'components.gyp:metrics_test_support',
 
             # Dependencies of network_time
             'components.gyp:network_time',
 
             # Dependencies of os_crypt
             'components.gyp:os_crypt',
 
             # Dependencies of password_manager
             'components.gyp:password_manager_core_browser',
             'components.gyp:password_manager_core_browser_test_support',
@@ skipping 480 matching lines @@
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }