Move InMemoryURLIndex outside of history namespace

chrome/browser/autocomplete/history_url_provider.cc

 // 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.
 
 #include "chrome/browser/autocomplete/history_url_provider.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 687 matching lines @@
       return kBaseScoreForNonInlineableResult + match_number;
   }
 }
 
 // static
 ACMatchClassifications HistoryURLProvider::ClassifyDescription(
     const base::string16& input_text,
     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,
           std::string::npos);
   return SpansFromTermMatch(
       description_matches, clean_description.length(), false);
 }
 
 void HistoryURLProvider::DoAutocomplete(history::HistoryBackend* backend,
                                         history::URLDatabase* db,
@@ skipping 426 matching lines @@
     AutocompleteMatch::ClassifyLocationInString(base::string16::npos, 0,
         match.contents.length(), ACMatchClassification::URL,
         &match.contents_class);
   }
   match.description = info.title();
   match.description_class =
       ClassifyDescription(params.input.text(), match.description);
   RecordAdditionalInfoFromUrlRow(info, &match);
   return match;
 }