Move InMemoryURLIndex outside of history namespace

chrome/browser/autocomplete/history_quick_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_quick_provider.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 28 matching lines @@
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "net/base/escape.h"
 #include "net/base/net_util.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "url/url_parse.h"
 #include "url/url_util.h"
 
-using history::InMemoryURLIndex;
-using history::ScoredHistoryMatch;
-using history::ScoredHistoryMatches;
-
 namespace {
 
 // Returns whether |url| is bookmarked in |bookmark_model| (which can be null
 // during testing). Used for ScoredHistoryMatchBuilderImpl.
 bool IsBookmarked(bookmarks::BookmarkModel* bookmark_model, const GURL& url) {
   return bookmark_model && bookmark_model->IsBookmarked(url);
 }
 
 }  // namespace
 
@@ skipping 198 matching lines @@
           net::FormatUrl(info.url(), languages_, format_types,
                          net::UnescapeRule::SPACES, NULL, NULL, NULL),
           ChromeAutocompleteSchemeClassifier(profile_));
   std::vector<size_t> offsets =
       OffsetsFromTermMatches(history_match.url_matches);
   base::OffsetAdjuster::Adjustments adjustments;
   match.contents = net::FormatUrlWithAdjustments(
       info.url(), languages_, format_types, net::UnescapeRule::SPACES, NULL,
       NULL, &adjustments);
   base::OffsetAdjuster::AdjustOffsets(adjustments, &offsets);
-  history::TermMatches new_matches =
+  TermMatches new_matches =
       ReplaceOffsetsInTermMatches(history_match.url_matches, offsets);
   match.contents_class =
       SpansFromTermMatch(new_matches, match.contents.length(), true);
 
   // Set |inline_autocompletion| and |allowed_to_be_default_match| if possible.
   if (history_match.can_inline) {
     DCHECK(!new_matches.empty());
     size_t inline_autocomplete_offset = new_matches[0].offset +
         new_matches[0].length;
     // |inline_autocomplete_offset| may be beyond the end of the
@@ skipping 16 matching lines @@
   match.description_class = SpansFromTermMatch(
       history_match.title_matches, match.description.length(), false);
 
   match.RecordAdditionalInfo("typed count", info.typed_count());
   match.RecordAdditionalInfo("visit count", info.visit_count());
   match.RecordAdditionalInfo("last visit", info.last_visit());
 
   return match;
 }
 
-history::InMemoryURLIndex* HistoryQuickProvider::GetIndex() {
+InMemoryURLIndex* HistoryQuickProvider::GetIndex() {
   if (index_for_testing_.get())
     return index_for_testing_.get();
 
   HistoryService* const history_service = HistoryServiceFactory::GetForProfile(
       profile_, ServiceAccessType::EXPLICIT_ACCESS);
   if (!history_service)
     return NULL;
 
   return history_service->InMemoryIndex();
 }