Revert of Turn components/crash into a layered component.

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 101 matching lines @@
       'content_settings/core/browser/content_settings_mock_provider.h',
       'content_settings/core/browser/content_settings_registry_unittest.cc',
       'content_settings/core/browser/content_settings_rule_unittest.cc',
       'content_settings/core/browser/content_settings_utils_unittest.cc',
       'content_settings/core/browser/cookie_settings_unittest.cc',
       'content_settings/core/browser/website_settings_registry_unittest.cc',
       'content_settings/core/common/content_settings_pattern_parser_unittest.cc',
       'content_settings/core/common/content_settings_pattern_unittest.cc',
     ],
     'crash_unittest_sources': [
-      'crash/content/app/crash_keys_win_unittest.cc',
+      'crash/app/crash_keys_win_unittest.cc',
     ],
     'crx_file_unittest_sources': [
       'crx_file/id_util_unittest.cc',
     ],
     'data_reduction_proxy_unittest_sources': [
       'data_reduction_proxy/content/browser/data_reduction_proxy_message_filter_unittest.cc',
       'data_reduction_proxy/core/browser/data_reduction_proxy_bypass_protocol_unittest.cc',
       'data_reduction_proxy/core/browser/data_reduction_proxy_bypass_stats_unittest.cc',
       'data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats_unittest.cc',
       'data_reduction_proxy/core/browser/data_reduction_proxy_config_retrieval_params_unittest.cc',
@@ skipping 96 matching lines @@
     'error_page_unittest_sources': [
       'error_page/renderer/net_error_helper_core_unittest.cc',
     ],
     'feedback_unittest_sources': [
       'feedback/feedback_common_unittest.cc',
       'feedback/feedback_data_unittest.cc',
       'feedback/feedback_uploader_chrome_unittest.cc',
       'feedback/feedback_uploader_unittest.cc',
     ],
     'gcm_driver_unittest_sources': [
+      'gcm_driver/gcm_account_tracker_unittest.cc',
       'gcm_driver/gcm_account_mapper_unittest.cc',
-      'gcm_driver/gcm_account_tracker_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',
     ],
     'gcm_driver_crypto_unittest_sources': [
       'gcm_driver/crypto/gcm_key_store_unittest.cc',
       'gcm_driver/crypto/gcm_message_cryptographer_unittest.cc',
     ],
@@ skipping 1446 matching lines @@
               'invalidation/impl/android/junit/',
               'policy/android/junit/'
             ],
           },
           'includes': [ '../build/host_jar.gypi' ],
          },
       ],
     }],
   ],
 }