Move image_unittest_util* into gfx_test_support target.

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.
 {
   'variables': {
     'chrome_unit_tests_sources': [
       '../apps/app_shim/app_shim_host_mac_unittest.cc',
       '../apps/app_shim/extension_app_shim_handler_mac_unittest.cc',
       '../apps/saved_devices_service_unittest.cc',
       '../apps/saved_files_service_unittest.cc',
@@ skipping 1468 matching lines @@
         '../content/content_shell_and_tests.gyp:test_support_content',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../sql/sql.gyp:sql',
         '../sql/sql.gyp:test_support_sql',
         '../sync/sync.gyp:sync',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/zlib/zlib.gyp:zlib',
+        '../ui/gfx/gfx.gyp:gfx_test_support',
         '../ui/message_center/message_center.gyp:message_center_test_support',
       ],
       'export_dependent_settings': [
         '../base/base.gyp:test_support_base',
         '../content/content_shell_and_tests.gyp:test_support_content',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
@@ skipping 149 matching lines @@
         'test/logging/win/file_logger.cc',
         'test/logging/win/file_logger.h',
         'test/logging/win/log_file_printer.cc',
         'test/logging/win/log_file_printer.h',
         'test/logging/win/log_file_reader.cc',
         'test/logging/win/log_file_reader.h',
         'test/logging/win/mof_data_parser.cc',
         'test/logging/win/mof_data_parser.h',
         'test/logging/win/test_log_collector.cc',
         'test/logging/win/test_log_collector.h',
-        '../ui/gfx/image/image_unittest_util.cc',
-        '../ui/gfx/image/image_unittest_util.h',
       ],
       'conditions': [
         ['OS!="ios"', {
           'dependencies': [
             'common/extensions/api/api.gyp:chrome_api',
             'plugin',
             'renderer',
             'utility',
             '../content/content.gyp:content_gpu',
             '../content/content.gyp:content_plugin',
@@ skipping 1206 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }