Merge 176009

chrome/chrome_tests_unit.gypi

 # 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.
 {
   'targets': [
     {
       # This target contains mocks and test utilities that don't belong in
       # production libraries but are used by more than one test executable.
       'target_name': 'test_support_common',
       'type': 'static_library',
@@ skipping 1422 matching lines @@
         'browser/webdata/web_apps_table_unittest.cc',
         'browser/webdata/web_data_service_test_util.h',
         'browser/webdata/web_data_service_unittest.cc',
         'browser/webdata/web_database_migration_unittest.cc',
         'browser/webdata/web_intents_table_unittest.cc',
         'common/bzip2_unittest.cc',
         'common/cancelable_task_tracker_unittest.cc',
         'common/child_process_logging_mac_unittest.mm',
         'common/chrome_paths_unittest.cc',
         'common/cloud_print/cloud_print_helpers_unittest.cc',
-        'common/common_param_traits_unittest.cc',
         'common/chrome_content_client_unittest.cc',
         'common/content_settings_helper_unittest.cc',
         'common/content_settings_pattern_parser_unittest.cc',
         'common/content_settings_pattern_unittest.cc',
         'common/extensions/command_unittest.cc',
         'common/extensions/csp_validator_unittest.cc',
         'common/extensions/event_filter_unittest.cc',
         'common/extensions/extension_constants_unittest.cc',
         'common/extensions/extension_file_util_unittest.cc',
         'common/extensions/extension_icon_set_unittest.cc',
@@ skipping 848 matching lines @@
             'unit_tests.isolate',
           ],
           'sources': [
             'unit_tests.isolate',
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }