Componentize history_types.{cc,h} and android_history_types.{cc,h}

chrome/browser/history/scored_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_HISTORY_SCORED_HISTORY_MATCH_H_
 #define CHROME_BROWSER_HISTORY_SCORED_HISTORY_MATCH_H_
 
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/strings/string16.h"
-#include "chrome/browser/history/history_types.h"
 #include "chrome/browser/history/in_memory_url_index_types.h"
 #include "components/history/core/browser/history_match.h"
+#include "components/history/core/browser/history_types.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 namespace history {
 
 class HistoryClient;
 class ScoredHistoryMatchTest;
 
 // An HistoryMatch that has a score as well as metrics defining where in the
 // history item's URL and/or page title matches have occurred.
 class ScoredHistoryMatch : public history::HistoryMatch {
@@ skipping 173 matching lines @@
   // matches) because if a non-inlineable match comes first than all matches
   // will get demoted later in HistoryQuickProvider to non-inlineable scores.
   // Set to -1 to indicate no maximum score.
   static int max_assigned_score_for_non_inlineable_matches_;
 };
 typedef std::vector<ScoredHistoryMatch> ScoredHistoryMatches;
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_SCORED_HISTORY_MATCH_H_