Attempt to reland r173248,173259

content/content_tests.gypi

 # Copyright (c) 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': [
     {
       'target_name': 'test_support_content',
       'type': 'static_library',
       'defines!': ['CONTENT_IMPLEMENTATION'],
@@ skipping 340 matching lines @@
         'common/inter_process_time_ticks_converter_unittest.cc',
         'common/page_zoom_unittest.cc',
         'common/resource_dispatcher_unittest.cc',
         'common/sandbox_mac_diraccess_unittest.mm',
         'common/sandbox_mac_fontloading_unittest.mm',
         'common/sandbox_mac_unittest_helper.h',
         'common/sandbox_mac_unittest_helper.mm',
         'common/sandbox_mac_system_access_unittest.mm',
         'components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc',
         'gpu/gpu_info_collector_unittest.cc',
-        'gpu/gpu_info_collector_unittest_win.cc',
         'renderer/active_notification_tracker_unittest.cc',
         'renderer/android/email_detector_unittest.cc',
         'renderer/android/phone_number_detector_unittest.cc',
         'renderer/disambiguation_popup_helper_unittest.cc',
         'renderer/gpu/input_event_filter_unittest.cc',
         'renderer/hyphenator/hyphenator_unittest.cc',
         'renderer/media/audio_message_filter_unittest.cc',
         'renderer/media/audio_renderer_mixer_manager_unittest.cc',
         'renderer/media/video_capture_impl_unittest.cc',
         'renderer/media/video_capture_message_filter_unittest.cc',
@@ skipping 579 matching lines @@
             'resource_dir': '../res',
             'additional_src_dirs': ['../content/public/android/javatests/'],
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
       ],
     }],
   ],
 }