Componentize HistoryMatch

components/history/core/browser/history_match.h

 // Copyright (c) 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.
 
-#ifndef CHROME_BROWSER_AUTOCOMPLETE_HISTORY_PROVIDER_UTIL_H_
-#define CHROME_BROWSER_AUTOCOMPLETE_HISTORY_PROVIDER_UTIL_H_
+#ifndef COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_MATCH_H_
+#define COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_MATCH_H_
 
 #include <deque>
-#include <vector>
 
-#include "chrome/browser/history/history_types.h"
+#include "components/history/core/browser/url_row.h"
 
 namespace history {
 
 // Used for intermediate history result operations.
 struct HistoryMatch {
   // Required for STL, we don't use this directly.
   HistoryMatch();
 
   HistoryMatch(const URLRow& url_info,
                size_t input_location,
@@ skipping 26 matching lines @@
   // locations.  If the user types "w", an innermost match ("website.com") is
   // better than a non-innermost match ("www.google.com").  If the user types
   // "x", no scheme in our prefix list (or "www.") begins with x, so all
   // matches are, vacuously, "innermost matches".
   bool innermost_match;
 };
 typedef std::deque<HistoryMatch> HistoryMatches;
 
 }  // namespace history
 
-#endif  // CHROME_BROWSER_AUTOCOMPLETE_HISTORY_PROVIDER_UTIL_H_
+#endif  // COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_MATCH_H_