Revert of Componentize HistoryURLProvider/ScoredHistoryMatch.

components/omnibox.gypi

 # Copyright 2014 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': [
     {
       # GN version: //components/omnibox
       'target_name': 'omnibox',
       'type': 'static_library',
@@ skipping 36 matching lines @@
         'omnibox/autocomplete_provider_listener.h',
         'omnibox/autocomplete_result.cc',
         'omnibox/autocomplete_result.h',
         'omnibox/autocomplete_scheme_classifier.h',
         'omnibox/base_search_provider.cc',
         'omnibox/base_search_provider.h',
         'omnibox/bookmark_provider.cc',
         'omnibox/bookmark_provider.h',
         'omnibox/history_provider.cc',
         'omnibox/history_provider.h',
-        'omnibox/history_url_provider.cc',
-        'omnibox/history_url_provider.h',
         'omnibox/in_memory_url_index_types.cc',
         'omnibox/in_memory_url_index_types.h',
         'omnibox/keyword_extensions_delegate.cc',
         'omnibox/keyword_extensions_delegate.h',
         'omnibox/keyword_provider.cc',
         'omnibox/keyword_provider.h',
         'omnibox/omnibox_field_trial.cc',
         'omnibox/omnibox_field_trial.h',
         'omnibox/omnibox_log.cc',
         'omnibox/omnibox_log.h',
         'omnibox/omnibox_switches.cc',
         'omnibox/omnibox_switches.h',
-        'omnibox/scored_history_match.cc',
-        'omnibox/scored_history_match.h',
         'omnibox/search_provider.cc',
         'omnibox/search_provider.h',
         'omnibox/search_suggestion_parser.cc',
         'omnibox/search_suggestion_parser.h',
         'omnibox/suggestion_answer.cc',
         'omnibox/suggestion_answer.h',
         'omnibox/url_prefix.cc',
         'omnibox/url_prefix.h',
       ],
     },
@@ skipping 10 matching lines @@
         '..',
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
         'omnibox/test_scheme_classifier.cc',
         'omnibox/test_scheme_classifier.h',
       ],
     },
   ],
 }