Move InMemoryURLIndex outside of history namespace

chrome/browser/history/history_service.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_HISTORY_SERVICE_H_
 #define CHROME_BROWSER_HISTORY_HISTORY_SERVICE_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 16 matching lines @@
 #include "chrome/browser/history/typed_url_syncable_service.h"
 #include "components/favicon_base/favicon_callback.h"
 #include "components/favicon_base/favicon_usage_data.h"
 #include "components/history/core/browser/keyword_id.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "sql/init_status.h"
 #include "sync/api/syncable_service.h"
 #include "ui/base/page_transition_types.h"
 
 class GURL;
+class InMemoryURLIndex;
+class InMemoryURLIndexTest;
 class PageUsageRequest;
 class SkBitmap;
 
 namespace base {
 class FilePath;
 class Thread;
 }
 
 namespace history {
 
 struct DownloadRow;
 struct HistoryAddPageArgs;
 class HistoryBackend;
 class HistoryClient;
 class HistoryDBTask;
 class HistoryDatabase;
 struct HistoryDatabaseParams;
 class HistoryQueryTest;
 class HistoryServiceObserver;
 class HistoryTest;
 class InMemoryHistoryBackend;
-class InMemoryURLIndex;
-class InMemoryURLIndexTest;
 struct KeywordSearchTermVisit;
 class PageUsageData;
 class URLDatabase;
 class VisitDelegate;
 class VisitFilter;
 class WebHistoryService;
 
 }  // namespace history
 
 // The history service records page titles, and visit times, as well as
@@ skipping 57 matching lines @@
 
   // Reads the number of times this URL has been visited.
   bool GetVisitCountForURL(const GURL& url, int* visit_count);
 
   // Returns a pointer to the TypedUrlSyncableService owned by HistoryBackend.
   // This method should only be called from the history thread, because the
   // returned service is intended to be accessed only via the history thread.
   history::TypedUrlSyncableService* GetTypedUrlSyncableService() const;
 
   // Return the quick history index.
-  history::InMemoryURLIndex* InMemoryIndex() const {
-    return in_memory_url_index_.get();
-  }
+  InMemoryURLIndex* InMemoryIndex() const { return in_memory_url_index_.get(); }
 
   // KeyedService:
   void Shutdown() override;
 
   // Navigation ----------------------------------------------------------------
 
   // Adds the given canonical URL to history with the given time as the visit
   // time. Referrer may be the empty string.
   //
   // The supplied context id is used to scope the given page ID. Page IDs
@@ skipping 369 matching lines @@
   friend class base::RefCountedThreadSafe<HistoryService>;
   friend class BackendDelegate;
   friend class FaviconService;
   friend class history::HistoryBackend;
   friend class history::HistoryQueryTest;
   friend class HistoryOperation;
   friend class HistoryQuickProviderTest;
   friend class history::HistoryTest;
   friend class HistoryURLProvider;
   friend class HistoryURLProviderTest;
-  friend class history::InMemoryURLIndexTest;
+  friend class ::InMemoryURLIndexTest;
   template<typename Info, typename Callback> friend class DownloadRequest;
   friend class PageUsageRequest;
   friend class RedirectRequest;
   friend class SyncBookmarkDataTypeControllerTest;
   friend class TestingProfile;
 
   // Called on shutdown, this will tell the history backend to complete and
   // will release pointers to it. No other functions should be called once
   // cleanup has happened that may dispatch to the history thread (because it
   // will be null).
@@ skipping 263 matching lines @@
   // outlive |HistoryService|.
   history::HistoryClient* history_client_;
 
   // Has the backend finished loading? The backend is loaded once Init has
   // completed.
   bool backend_loaded_;
 
   // The index used for quick history lookups.
   // TODO(mrossetti): Move in_memory_url_index out of history_service.
   // See http://crbug.com/138321
-  scoped_ptr<history::InMemoryURLIndex> in_memory_url_index_;
+  scoped_ptr<InMemoryURLIndex> in_memory_url_index_;
 
   ObserverList<history::HistoryServiceObserver> observers_;
   base::CallbackList<void(const std::set<GURL>&)>
       favicon_changed_callback_list_;
 
   history::DeleteDirectiveHandler delete_directive_handler_;
 
   // All vended weak pointers are invalidated in Cleanup().
   base::WeakPtrFactory<HistoryService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryService);
 };
 
 #endif  // CHROME_BROWSER_HISTORY_HISTORY_SERVICE_H_