Revert of Componentize HistoryURLProvider/ScoredHistoryMatch.

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 1257 matching lines @@
       'browser/autocomplete/autocomplete_controller.h',
       'browser/autocomplete/autocomplete_controller_delegate.h',
       'browser/autocomplete/builtin_provider.cc',
       'browser/autocomplete/builtin_provider.h',
       'browser/autocomplete/chrome_autocomplete_provider_client.cc',
       'browser/autocomplete/chrome_autocomplete_provider_client.h',
       'browser/autocomplete/chrome_autocomplete_scheme_classifier.cc',
       'browser/autocomplete/chrome_autocomplete_scheme_classifier.h',
       'browser/autocomplete/history_quick_provider.cc',
       'browser/autocomplete/history_quick_provider.h',
+      'browser/autocomplete/history_url_provider.cc',
+      'browser/autocomplete/history_url_provider.h',
       'browser/autocomplete/in_memory_url_index.cc',
       'browser/autocomplete/in_memory_url_index.h',
       'browser/autocomplete/in_memory_url_index_factory.cc',
       'browser/autocomplete/in_memory_url_index_factory.h',
+      'browser/autocomplete/scored_history_match.cc',
+      'browser/autocomplete/scored_history_match.h',
       'browser/autocomplete/shortcuts_backend.cc',
       'browser/autocomplete/shortcuts_backend.h',
       'browser/autocomplete/shortcuts_backend_factory.cc',
       'browser/autocomplete/shortcuts_backend_factory.h',
       'browser/autocomplete/shortcuts_database.cc',
       'browser/autocomplete/shortcuts_database.h',
       'browser/autocomplete/shortcuts_provider.cc',
       'browser/autocomplete/shortcuts_provider.h',
       'browser/autocomplete/url_index_private_data.cc',
       'browser/autocomplete/url_index_private_data.h',
@@ skipping 2726 matching lines @@
           'variables': {
             'proto_in_dir': 'browser/sync_file_system/drive_backend',
             'proto_out_dir': 'chrome/browser/sync_file_system/drive_backend',
           },
           'includes': [ '../build/protoc.gypi' ]
         },
       ],
     },],
   ],
 }