Move InMemoryURLIndex outside of history namespace

chrome/browser/autocomplete/in_memory_url_index.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_AUTOCOMPLETE_IN_MEMORY_URL_INDEX_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_IN_MEMORY_URL_INDEX_H_
 
 #include <functional>
 #include <map>
 #include <set>
@@ skipping 18 matching lines @@
 
 namespace base {
 class Time;
 }
 
 namespace in_memory_url_index {
 class InMemoryURLIndexCacheItem;
 }
 
 namespace history {
+class HistoryDatabase;
+}
 
-namespace imui = in_memory_url_index;
-
-class HistoryDatabase;
 class URLIndexPrivateData;
 
 // The URL history source.
 // Holds portions of the URL database in memory in an indexed form.  Used to
 // quickly look up matching URLs for a given query string.  Used by
 // the HistoryURLProvider for inline autocomplete and to provide URL
 // matches to the omnibox.
 //
 // Note about multi-byte codepoints and the data structures in the
 // InMemoryURLIndex class: One will quickly notice that no effort is made to
 // insure that multi-byte character boundaries are detected when indexing the
 // words and characters in the URL history database except when converting
 // URL strings to lowercase. Multi-byte-edness makes no difference when
 // indexing or when searching the index as the final filtering of results
 // is dependent on the comparison of a string of bytes, not individual
 // characters. While the lookup of those bytes during a search in the
 // |char_word_map_| could serve up words in which the individual char16
 // occurs as a portion of a composite character the next filtering step
 // will eliminate such words except in the case where a single character
 // is being searched on and which character occurs as the second char16 of a
 // multi-char16 instance.
-class InMemoryURLIndex : public HistoryServiceObserver,
+class InMemoryURLIndex : public history::HistoryServiceObserver,
                          public base::SupportsWeakPtr<InMemoryURLIndex> {
  public:
   // Defines an abstract class which is notified upon completion of restoring
   // the index's private data either by reading from the cache file or by
   // rebuilding from the history database.
   class RestoreCacheObserver {
    public:
     virtual ~RestoreCacheObserver();
 
     // Callback that lets the observer know that the restore operation has
@@ skipping 65 matching lines @@
   }
 
  private:
   friend class ::HistoryQuickProviderTest;
   friend class InMemoryURLIndexTest;
   friend class InMemoryURLIndexCacheTest;
   FRIEND_TEST_ALL_PREFIXES(InMemoryURLIndexTest, ExpireRow);
   FRIEND_TEST_ALL_PREFIXES(LimitedInMemoryURLIndexTest, Initialization);
 
   // HistoryDBTask used to rebuild our private data from the history database.
-  class RebuildPrivateDataFromHistoryDBTask : public HistoryDBTask {
+  class RebuildPrivateDataFromHistoryDBTask : public history::HistoryDBTask {
    public:
     explicit RebuildPrivateDataFromHistoryDBTask(
         InMemoryURLIndex* index,
         const std::string& languages,
         const std::set<std::string>& scheme_whitelist);
 
-    bool RunOnDBThread(HistoryBackend* backend,
+    bool RunOnDBThread(history::HistoryBackend* backend,
                        history::HistoryDatabase* db) override;
     void DoneRunOnMainThread() override;
 
    private:
     ~RebuildPrivateDataFromHistoryDBTask() override;
 
     InMemoryURLIndex* index_;  // Call back to this index at completion.
     std::string languages_;    // Languages for word-breaking.
     std::set<std::string> scheme_whitelist_;  // Schemes to be indexed.
     bool succeeded_;  // Indicates if the rebuild was successful.
@@ skipping 23 matching lines @@
   // Callback used by RebuildPrivateDataFromHistoryDBTask to signal completion
   // or rebuilding our private data from the history database. |succeeded|
   // will be true if the rebuild was successful. |data| will point to a new
   // instanceof the private data just rebuilt.
   void DoneRebuidingPrivateDataFromHistoryDB(
       bool succeeded,
       scoped_refptr<URLIndexPrivateData> private_data);
 
   // Rebuilds the history index from the history database in |history_db|.
   // Used for unit testing only.
-  void RebuildFromHistory(HistoryDatabase* history_db);
+  void RebuildFromHistory(history::HistoryDatabase* history_db);
 
   // Determines if the private data was successfully reloaded from the cache
   // file or if the private data must be rebuilt from the history database.
   // |private_data_ptr|'s data will be NULL if the cache file load failed. If
   // successful, sets the private data and notifies any
   // |restore_cache_observer_|. Otherwise, kicks off a rebuild from the history
   // database.
   void OnCacheLoadDone(scoped_refptr<URLIndexPrivateData> private_data_ptr);
 
   // Callback function that sets the private data from the just-restored-from-
   // file |private_data|. Notifies any |restore_cache_observer_| that the
   // restore has succeeded.
   void OnCacheRestored(URLIndexPrivateData* private_data);
 
   // Posts a task to cache the index private data and write the cache file to
   // the history directory.
   void PostSaveToCacheFileTask();
 
   // Saves private_data_ to the given |path|. Runs on the UI thread.
   // Provided for unit testing so that a test cache file can be used.
   void DoSaveToCacheFile(const base::FilePath& path);
 
   // Notifies the observer, if any, of the success of the private data caching.
   // |succeeded| is true on a successful save.
   void OnCacheSaveDone(bool succeeded);
 
   // HistoryServiceObserver:
   void OnURLVisited(HistoryService* history_service,
                     ui::PageTransition transition,
-                    const URLRow& row,
-                    const RedirectList& redirects,
+                    const history::URLRow& row,
+                    const history::RedirectList& redirects,
                     base::Time visit_time) override;
   void OnURLsModified(HistoryService* history_service,
-                      const URLRows& changed_urls) override;
+                      const history::URLRows& changed_urls) override;
   void OnURLsDeleted(HistoryService* history_service,
                      bool all_history,
                      bool expired,
-                     const URLRows& deleted_rows,
+                     const history::URLRows& deleted_rows,
                      const std::set<GURL>& favicon_urls) override;
   void OnHistoryServiceLoaded(HistoryService* history_service) override;
 
   // Sets the directory wherein the cache file will be maintained.
   // For unit test usage only.
   void set_history_dir(const base::FilePath& dir_path) {
     history_dir_ = dir_path;
   }
 
   // Returns a pointer to our private data. For unit testing only.
@@ skipping 44 matching lines @@
   // index has been destructed.
   bool needs_to_be_cached_;
 
   // This flag is set to true if we want to listen to the
   // HistoryServiceLoaded Notification.
   bool listen_to_history_service_loaded_;
 
   DISALLOW_COPY_AND_ASSIGN(InMemoryURLIndex);
 };
 
-}  // namespace history
-
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_IN_MEMORY_URL_INDEX_H_