Turn the utility process image decoder into a Mojo service.

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 229 matching lines @@
       'history/core/browser/top_sites_database_unittest.cc',
       'history/core/browser/top_sites_impl_unittest.cc',
       'history/core/browser/typed_url_syncable_service_unittest.cc',
       'history/core/browser/url_database_unittest.cc',
       'history/core/browser/url_utils_unittest.cc',
       'history/core/browser/visit_database_unittest.cc',
       'history/core/browser/visit_filter_unittest.cc',
       'history/core/browser/visit_tracker_unittest.cc',
       'history/core/common/thumbnail_score_unittest.cc',
     ],
+    'image_decoder_unittest_sources': [
+      'image_decoder/image_decoder_impl_unittest.cc',
+    ],
     'instance_id_unittest_sources': [
       'gcm_driver/instance_id/instance_id_driver_unittest.cc',
     ],
     'invalidation_unittest_sources': [
       'invalidation/fake_invalidator_unittest.cc',
       'invalidation/gcm_network_channel_unittest.cc',
       'invalidation/invalidation_logger_unittest.cc',
       'invalidation/invalidation_notifier_unittest.cc',
       'invalidation/invalidator_registrar_unittest.cc',
       'invalidation/non_blocking_invalidator_unittest.cc',
@@ skipping 593 matching lines @@
         [ 'cld_version==0 or cld_version==2', {
           'dependencies': [
             # Unit tests should always use statically-linked CLD data.
             '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_static', ],
         }],
         ['OS != "ios"', {
           'sources': [
             '<@(devtools_http_handler_unittest_sources)',
             '<@(error_page_unittest_sources)',
             '<@(guest_view_unittest_sources)',
+            '<@(image_decoder_unittest_sources)',
             '<@(navigation_interception_unittest_sources)',
             '<@(network_hints_unittest_sources)',
             '<@(power_unittest_sources)',
             '<@(scheduler_unittest_sources)',
             '<@(storage_monitor_unittest_sources)',
             '<@(ui_unittest_sources)',
             '<@(visitedlink_unittest_sources)',
             '<@(web_cache_unittest_sources)',
             '<@(webcrypto_unittest_sources)',
             '<@(web_modal_unittest_sources)',
           ],
           'dependencies': [
             '../skia/skia.gyp:skia',
             'components.gyp:autofill_content_browser',
             'components.gyp:autofill_content_renderer',
             'components.gyp:autofill_content_test_support',
             'components.gyp:data_reduction_proxy_content_browser',
             'components.gyp:devtools_http_handler',
             'components.gyp:dom_distiller_content',
             'components.gyp:error_page_renderer',
             'components.gyp:favicon_content',
             'components.gyp:history_content_browser',
+            'components.gyp:image_decoder',
             'components.gyp:keyed_service_content',
             'components.gyp:navigation_interception',
             'components.gyp:network_hints_renderer',
             'components.gyp:password_manager_content_browser',
             'components.gyp:password_manager_content_common',
             'components.gyp:power',
             'components.gyp:precache_content',
             'components.gyp:sessions_content',
             'components.gyp:storage_monitor',
             'components.gyp:storage_monitor_test_support',
@@ skipping 535 matching lines @@
             ['use_x11==1', {
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
     ['OS == "android"', {
+      'variables': {
+        'conditions': [
+          ['v8_use_external_startup_data==1', {
+            'components_unittests_pak_input_resources': [
+              '<(PRODUCT_DIR)/natives_blob.bin',
+              '<(PRODUCT_DIR)/snapshot_blob.bin',
+            ],
+          }],
+        ],
+      },
       'targets': [
         {
+          'target_name': 'components_unittests_paks_copy',
+          'type': 'none',
+          'dependencies': [
+            'components_unittests',
+          ],
+          'copies': [
+            {
+              'destination': '<(PRODUCT_DIR)/components_unittests_apk/assets',
+              'files': [
+                '<@(components_unittests_pak_input_resources)',
+              ],
+            }
+          ],
+        },
+        {
           'target_name': 'components_unittests_apk',
           'type': 'none',
           'dependencies': [
             'components_unittests',
+            'components_unittests_paks_copy',
             'components.gyp:invalidation_java',
           ],
           'variables': {
             'test_suite_name': 'components_unittests',
+            'asset_location': '<(PRODUCT_DIR)/components_unittests_apk/assets',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }