Move histogram_manager from components/metrics to components/cronet

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 157 matching lines @@
     'copresence_unittest_sources': [
       'copresence/copresence_state_unittest.cc',
       'copresence/handlers/audio/audio_directive_handler_unittest.cc',
       'copresence/handlers/audio/audio_directive_list_unittest.cc',
       'copresence/handlers/directive_handler_unittest.cc',
       'copresence/handlers/gcm_handler_unittest.cc',
       'copresence/rpc/http_post_unittest.cc',
       'copresence/rpc/rpc_handler_unittest.cc',
       'copresence/timed_map_unittest.cc',
     ],
+    'cronet_unittest_sources': [
+      'cronet/histogram_manager_unittest.cc',
+    ],
     'enhanced_bookmarks_unittest_sources': [
       'enhanced_bookmarks/enhanced_bookmark_model_unittest.cc',
       'enhanced_bookmarks/image_store_ios_unittest.mm',
       'enhanced_bookmarks/image_store_unittest.cc',
       'enhanced_bookmarks/item_position_unittest.cc',
     ],
     'error_page_unittest_sources': [
       'error_page/renderer/net_error_helper_core_unittest.cc',
     ],
     'feedback_unittest_sources': [
@@ skipping 60 matching lines @@
     ],
     'login_unittest_sources': [
       'login/screens/screen_context_unittest.cc',
     ],
     'metrics_unittest_sources': [
       'metrics/call_stack_profile_metrics_provider_unittest.cc',
       'metrics/compression_utils_unittest.cc',
       'metrics/daily_event_unittest.cc',
       'metrics/gpu/gpu_metrics_provider_unittest.cc',
       'metrics/histogram_encoder_unittest.cc',
-      'metrics/histogram_manager_unittest.cc',
       'metrics/machine_id_provider_win_unittest.cc',
       'metrics/metrics_hashes_unittest.cc',
       'metrics/metrics_log_manager_unittest.cc',
       'metrics/metrics_log_unittest.cc',
       'metrics/metrics_reporting_scheduler_unittest.cc',
       'metrics/metrics_service_unittest.cc',
       'metrics/metrics_state_manager_unittest.cc',
       'metrics/net/net_metrics_log_uploader_unittest.cc',
       'metrics/persisted_logs_unittest.cc',
       'metrics/profiler/profiler_metrics_provider_unittest.cc',
@@ skipping 603 matching lines @@
                   '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
                   '$(SDKROOT)/System/Library/Frameworks/ImageCaptureCore.framework',
                 ],
               },
               'sources!': [
                 'password_manager/core/browser/password_store_default_unittest.cc',
               ],
             }],
             ['OS == "android"', {
               'sources': [
+                '<@(cronet_unittest_sources)',
                 'data_reduction_proxy/content/browser/data_reduction_proxy_debug_blocking_page_unittest.cc',
                 'data_reduction_proxy/content/browser/data_reduction_proxy_debug_resource_throttle_unittest.cc',
                 'data_reduction_proxy/content/browser/data_reduction_proxy_debug_ui_manager_unittest.cc',
                 'invalidation/invalidation_logger_unittest.cc',
                 'invalidation/invalidation_service_android_unittest.cc',
               ],
               'sources!': [
                 'gcm_driver/gcm_account_mapper_unittest.cc',
                 'gcm_driver/gcm_channel_status_request_unittest.cc',
                 'gcm_driver/gcm_client_impl_unittest.cc',
                 'gcm_driver/gcm_delayed_task_controller_unittest.cc',
                 'gcm_driver/gcm_driver_desktop_unittest.cc',
                 'gcm_driver/gcm_stats_recorder_impl_unittest.cc',
                 'sessions/session_backend_unittest.cc',
                 'signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc',
                 'storage_monitor/media_storage_util_unittest.cc',
                 'storage_monitor/storage_info_unittest.cc',
                 'storage_monitor/storage_monitor_unittest.cc',
                 'web_modal/web_contents_modal_dialog_manager_unittest.cc',
               ],
               'dependencies': [
+                'components.gyp:cronet_static',
                 'components.gyp:data_reduction_proxy_content',
                 '../testing/android/native_test.gyp:native_test_native_code',
               ],
               'dependencies!': [
                 'components.gyp:storage_monitor',
                 'components.gyp:storage_monitor_test_support',
                 'components.gyp:web_modal',
                 'components.gyp:web_modal_test_support',
               ],
             }],
@@ skipping 336 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }