Revert of Componentize TemplateURLService

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 1142 matching lines @@
       'browser/search/suggestions/suggestions_source.cc',
       'browser/search/suggestions/suggestions_source.h',
       'browser/search/suggestions/suggestions_store.cc',
       'browser/search/suggestions/suggestions_store.h',
       'browser/search/suggestions/thumbnail_manager.cc',
       'browser/search/suggestions/thumbnail_manager.h',
       'browser/search_engines/chrome_template_url_service_client.cc',
       'browser/search_engines/chrome_template_url_service_client.h',
       'browser/search_engines/default_search_pref_migration.cc',
       'browser/search_engines/default_search_pref_migration.h',
+      'browser/search_engines/search_host_to_urls_map.cc',
+      'browser/search_engines/search_host_to_urls_map.h',
       'browser/search_engines/search_provider_install_data.cc',
       'browser/search_engines/search_provider_install_data.h',
       'browser/search_engines/search_provider_install_state_message_filter.cc',
       'browser/search_engines/search_provider_install_state_message_filter.h',
       'browser/search_engines/template_url_fetcher.cc',
       'browser/search_engines/template_url_fetcher.h',
       'browser/search_engines/template_url_fetcher_callbacks.h',
       'browser/search_engines/template_url_fetcher_factory.cc',
       'browser/search_engines/template_url_fetcher_factory.h',
       'browser/search_engines/template_url_parser.cc',
       'browser/search_engines/template_url_parser.h',
+      'browser/search_engines/template_url_service.cc',
+      'browser/search_engines/template_url_service.h',
       'browser/search_engines/template_url_service_android.cc',
       'browser/search_engines/template_url_service_android.h',
+      'browser/search_engines/template_url_service_client.h',
       'browser/search_engines/template_url_service_factory.cc',
       'browser/search_engines/template_url_service_factory.h',
+      'browser/search_engines/template_url_service_observer.h',
       'browser/search_engines/ui_thread_search_terms_data.cc',
       'browser/search_engines/ui_thread_search_terms_data.h',
       'browser/search_engines/ui_thread_search_terms_data_android.cc',
       'browser/search_engines/ui_thread_search_terms_data_android.h',
+      'browser/search_engines/util.cc',
+      'browser/search_engines/util.h',
       'browser/services/gcm/gcm_account_tracker.cc',
       'browser/services/gcm/gcm_account_tracker.h',
       'browser/services/gcm/gcm_profile_service.cc',
       'browser/services/gcm/gcm_profile_service.h',
       'browser/services/gcm/gcm_profile_service_factory.cc',
       'browser/services/gcm/gcm_profile_service_factory.h',
       'browser/services/gcm/permission_bubble_request_impl.cc',
       'browser/services/gcm/permission_bubble_request_impl.h',
       'browser/services/gcm/permission_context_base.cc',
       'browser/services/gcm/permission_context_base.h',
@@ skipping 399 matching lines @@
       'browser/web_resource/notification_promo.cc',
       'browser/web_resource/notification_promo.h',
       'browser/web_resource/promo_resource_service.cc',
       'browser/web_resource/promo_resource_service.h',
       'browser/web_resource/resource_request_allowed_notifier.cc',
       'browser/web_resource/resource_request_allowed_notifier.h',
       'browser/web_resource/web_resource_service.cc',
       'browser/web_resource/web_resource_service.h',
       'browser/webdata/autocomplete_syncable_service.cc',
       'browser/webdata/autocomplete_syncable_service.h',
+      'browser/webdata/keyword_table.cc',
+      'browser/webdata/keyword_table.h',
+      'browser/webdata/keyword_web_data_service.cc',
+      'browser/webdata/keyword_web_data_service.h',
       'browser/webdata/logins_table.cc',
       'browser/webdata/logins_table.h',
       'browser/webdata/logins_table_win.cc',
       'browser/webdata/web_apps_table.cc',
       'browser/webdata/web_apps_table.h',
       'browser/webdata/web_data_service.cc',
       'browser/webdata/web_data_service.h',
       'browser/webdata/web_data_service_factory.cc',
       'browser/webdata/web_data_service_factory.h',
       'browser/webdata/web_data_service_win.cc',
@@ skipping 1981 matching lines @@
             'package_name': 'org/chromium/chrome/browser',
             'template_deps': ['browser/android/tab_load_status.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
       ],
      },
     ],
   ],
 }