Move InMemoryURLIndex into chrome/browser/autocomplete

chrome/browser/autocomplete/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 COMPONENTS_HISTORY_CORE_BROWSER_SCORED_HISTORY_MATCH_H_
-#define COMPONENTS_HISTORY_CORE_BROWSER_SCORED_HISTORY_MATCH_H_
+#ifndef CHROME_BROWSER_AUTOCOMPLETE_SCORED_HISTORY_MATCH_H_
+#define CHROME_BROWSER_AUTOCOMPLETE_SCORED_HISTORY_MATCH_H_
 
 #include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
 #include "base/time/time.h"
+#include "chrome/browser/autocomplete/in_memory_url_index_types.h"
 #include "components/history/core/browser/history_match.h"
 #include "components/history/core/browser/history_types.h"
-#include "components/history/core/browser/in_memory_url_index_types.h"
 
 namespace history {
 
 // 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.
 struct ScoredHistoryMatch : public HistoryMatch {
   // The Builder inner class allows the embedder to control how matches are
   // scored (we cannot use a base::Callback<> as base::Bind() is limited to 6
   // parameters).
+  // TODO(sdefresne): remove this since ScoredHistoryMatch can now depends on
+  // chrome/browser/autocomplete and components/bookmarks
+  // http://crbug.com/462645
   class Builder {
    public:
     Builder() {}
     virtual ~Builder() {}
 
     // Creates a new match with a raw score calculated for the history item
     // given in |row| with recent visits as indicated in |visits|.  First
     // determines if the row qualifies by seeing if all of the terms in
     // |terms_vector| occur in |row|.  If so, calculates a raw score.  This raw
     // score is in part determined by whether the matches occur at word
@@ skipping 63 matching lines @@
   // Term matches within the page title.
   TermMatches title_matches;
 
   // True if this is a candidate for in-line autocompletion.
   bool can_inline;
 };
 typedef std::vector<ScoredHistoryMatch> ScoredHistoryMatches;
 
 }  // namespace history
 
-#endif  // COMPONENTS_HISTORY_CORE_BROWSER_SCORED_HISTORY_MATCH_H_
+#endif  // CHROME_BROWSER_AUTOCOMPLETE_SCORED_HISTORY_MATCH_H_