Revert of Split the code for fetching images and for decoding images into two separate classes.

chrome/chrome_browser.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': {
     # All .cc, .h, .m, and .mm files under browser except for:
     # * tests and mocks.
     # * code below browser/chromeos
     # * code below browser/extensions
@@ skipping 553 matching lines @@
       'browser/search/instant_service.cc',
       'browser/search/instant_service.h',
       'browser/search/instant_service_factory.cc',
       'browser/search/instant_service_factory.h',
       'browser/search/instant_service_observer.cc',
       'browser/search/instant_service_observer.h',
       'browser/search/most_visited_iframe_source.cc',
       'browser/search/most_visited_iframe_source.h',
       'browser/search/search.cc',
       'browser/search/search.h',
-      'browser/search/suggestions/image_decoder_impl.cc',
-      'browser/search/suggestions/image_decoder_impl.h',
       'browser/search/suggestions/image_fetcher_impl.cc',
       'browser/search/suggestions/image_fetcher_impl.h',
       'browser/search/suggestions/suggestions_service_factory.cc',
       'browser/search/suggestions/suggestions_service_factory.h',
       'browser/search/suggestions/suggestions_ui.cc',
       'browser/search/suggestions/suggestions_ui.h',
       'browser/search/thumbnail_source.cc',
       'browser/search/thumbnail_source.h',
       'browser/sessions/restore_on_startup_policy_handler.cc',
       'browser/sessions/restore_on_startup_policy_handler.h',
@@ skipping 2753 matching lines @@
             '../components/components.gyp:data_use_measurement_content',
             '../components/components.gyp:devtools_discovery',
             '../components/components.gyp:devtools_http_handler',
             '../components/components.gyp:dom_distiller_content_browser',
             '../components/components.gyp:domain_reliability',
             '../components/components.gyp:error_page_common',
             '../components/components.gyp:favicon_content',
             '../components/components.gyp:flags_ui',
             '../components/components.gyp:guest_view_browser',
             '../components/components.gyp:history_content_browser',
-            '../components/components.gyp:image_fetcher',
             '../components/components.gyp:keyed_service_content',
             '../components/components.gyp:metrics_gpu',
             '../components/components.gyp:metrics_profiler',
             '../components/components.gyp:metrics_profiler_content',
             '../components/components.gyp:navigation_interception',
             '../components/components.gyp:net_log',
             '../components/components.gyp:network_hints_common',
             '../components/components.gyp:network_session_configurator',
             '../components/components.gyp:ntp_snippets',
             '../components/components.gyp:ntp_tiles',
@@ skipping 918 matching lines @@
             '../components/components.gyp:rlz',
             '../components/components.gyp:search_engines',
             '../rlz/rlz.gyp:rlz_lib',
             'common',
           ],
         },
       ],
     }],
   ],
 }