Move InMemoryURLIndex outside of history namespace

chrome/browser/autocomplete/history_url_provider.cc

Index: chrome/browser/autocomplete/history_url_provider.cc
diff --git a/chrome/browser/autocomplete/history_url_provider.cc b/chrome/browser/autocomplete/history_url_provider.cc
index d433caf271b8f2d6694d2fede17319b1fa399e46..3f4eb91a484a95692cb24248ca527d8af01e6c2e 100644
--- a/chrome/browser/autocomplete/history_url_provider.cc
+++ b/chrome/browser/autocomplete/history_url_provider.cc
@@ -705,14 +705,14 @@ ACMatchClassifications HistoryURLProvider::ClassifyDescription(
     const base::string16& description) {
   base::string16 clean_description =
       bookmarks::CleanUpTitleForMatching(description);
-  history::TermMatches description_matches(SortAndDeoverlapMatches(
-      history::MatchTermInString(input_text, clean_description, 0)));
-  history::WordStarts description_word_starts;
-  history::String16VectorFromString16(
-      clean_description, false, &description_word_starts);
+  TermMatches description_matches(SortAndDeoverlapMatches(
+      MatchTermInString(input_text, clean_description, 0)));
+  WordStarts description_word_starts;
+  String16VectorFromString16(clean_description, false,
+                             &description_word_starts);

[Mark P, 2015/02/27 20:57:56]

nit: I think this fits in one line.

[sdefresne, 2015/03/02 08:54:14]

almost, it is 81 characters :-)

   // If HistoryURL retrieves any matches (and hence we reach this code), we
   // are guaranteed that the beginning of input_text must be a word break.
-  history::WordStarts offsets(1, 0u);
+  WordStarts offsets(1, 0u);
   description_matches =
       ScoredHistoryMatchBuilderImpl::FilterTermMatchesByWordStarts(
           description_matches, offsets, description_word_starts, 0,