Revert of Componentize TemplateURLService

components/search_engines.gypi

Index: components/search_engines.gypi
diff --git a/components/search_engines.gypi b/components/search_engines.gypi
index d0afdd54f0169ac01e3a47e1c326b0bb04acc409..21cf22f962cdf6858ffd987bfd42d8b0efb3e9fd 100644
--- a/components/search_engines.gypi
+++ b/components/search_engines.gypi
@@ -11,20 +11,14 @@
         '../base/base.gyp:base',
         '../google_apis/google_apis.gyp:google_apis',
         '../net/net.gyp:net',
-        '../sql/sql.gyp:sql',
-        '../sync/sync.gyp:sync',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../url/url.gyp:url_lib',
         'component_metrics_proto',
         'components_strings.gyp:components_strings',
         'google_core_browser',
-        'keyed_service_core',
         'policy',
         'pref_registry',
-        'rappor',
         'search_engines/prepopulated_engines.gyp:prepopulated_engines',
-        'url_fixer',
-        'webdata_common',
       ],
       'include_dirs': [
         '..',
@@ -34,17 +28,11 @@
         'search_engines/default_search_manager.h',
         'search_engines/default_search_policy_handler.cc',
         'search_engines/default_search_policy_handler.h',
-        'search_engines/keyword_table.cc',
-        'search_engines/keyword_table.h',
-        'search_engines/keyword_web_data_service.cc',
-        'search_engines/keyword_web_data_service.h',
         'search_engines/search_engine_type.h',
         'search_engines/search_engines_pref_names.cc',
         'search_engines/search_engines_pref_names.h',
         'search_engines/search_engines_switches.cc',
         'search_engines/search_engines_switches.h',
-        'search_engines/search_host_to_urls_map.cc',
-        'search_engines/search_host_to_urls_map.h',
         'search_engines/search_terms_data.cc',
         'search_engines/search_terms_data.h',
         'search_engines/template_url.cc',
@@ -54,12 +42,6 @@
         'search_engines/template_url_id.h',
         'search_engines/template_url_prepopulate_data.cc',
         'search_engines/template_url_prepopulate_data.h',
-        'search_engines/template_url_service.cc',
-        'search_engines/template_url_service.h',
-        'search_engines/template_url_service_client.h',
-        'search_engines/template_url_service_observer.h',
-        'search_engines/util.cc',
-        'search_engines/util.h',
       ],
     },
   ],