Revert 276642 "Turn FaviconClient into a Keyed service."

trunk/src/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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 626 matching lines @@
         'browser/extensions/signin/scoped_gaia_auth_extension.cc',
         'browser/extensions/signin/scoped_gaia_auth_extension.h',
         'browser/extensions/token_cache/token_cache_service.cc',
         'browser/extensions/token_cache/token_cache_service.h',
         'browser/extensions/token_cache/token_cache_service_factory.cc',
         'browser/extensions/token_cache/token_cache_service_factory.h',
         'browser/external_protocol/external_protocol_handler.cc',
         'browser/external_protocol/external_protocol_handler.h',
         'browser/favicon/chrome_favicon_client.cc',
         'browser/favicon/chrome_favicon_client.h',
-        'browser/favicon/chrome_favicon_client_factory.cc',
-        'browser/favicon/chrome_favicon_client_factory.h',
         'browser/favicon/favicon_changed_details.cc',
         'browser/favicon/favicon_changed_details.h',
         'browser/favicon/favicon_handler.cc',
         'browser/favicon/favicon_handler.h',
         'browser/favicon/favicon_service.cc',
         'browser/favicon/favicon_service.h',
         'browser/favicon/favicon_service_factory.cc',
         'browser/favicon/favicon_service_factory.h',
         'browser/favicon/favicon_tab_helper.cc',
         'browser/favicon/favicon_tab_helper.h',
@@ skipping 3136 matching lines @@
             'package_name': 'org/chromium/chrome/browser',
             'template_deps': ['browser/android/tab_load_status.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
       ],
      },
     ],
   ],
 }