Move Ownership of IMUI to HistoryService.

chrome/browser/history/history.h

 // Copyright (c) 2011 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_H_
 #define CHROME_BROWSER_HISTORY_HISTORY_H_
 #pragma once
 
 #include <set>
 #include <vector>
@@ skipping 25 matching lines @@
 class Profile;
 
 namespace base {
 class Thread;
 class Time;
 }
 
 namespace history {
 class InMemoryHistoryBackend;
 class InMemoryURLIndex;
+class InMemoryURLIndexTest;
 class HistoryAddPageArgs;
 class HistoryBackend;
 class HistoryDatabase;
 struct HistoryDetails;
 class HistoryQueryTest;
 class URLDatabase;
 }  // namespace history
 
 
 // HistoryDBTask can be used to process arbitrary work on the history backend
 // thread. HistoryDBTask is scheduled using HistoryService::ScheduleDBTask.
 // When HistoryBackend processes the task it invokes RunOnDBThread. Once the
 // task completes and has not been canceled, DoneRunOnMainThread is invoked back
 // on the main thread.
 class HistoryDBTask : public base::RefCountedThreadSafe<HistoryDBTask> {
  public:
   // Invoked on the database thread. The return value indicates whether the
   // task is done. A return value of true signals the task is done and
   // RunOnDBThread should NOT be invoked again. A return value of false
   // indicates the task is not done, and should be run again after other
   // tasks are given a chance to be processed.
   virtual bool RunOnDBThread(history::HistoryBackend* backend,
                              history::HistoryDatabase* db) = 0;
 
-  // Invoked on the main thread once RunOnDBThread has returned false. This is
+  // Invoked on the main thread once RunOnDBThread has returned true. This is
   // only invoked if the request was not canceled and returned true from
   // RunOnDBThread.
   virtual void DoneRunOnMainThread() = 0;
 
  protected:
   friend class base::RefCountedThreadSafe<HistoryDBTask>;
 
   virtual ~HistoryDBTask() {}
 };
 
@@ skipping 55 matching lines @@
 
   // Triggers the backend to load if it hasn't already, and then returns the
   // in-memory URL database. The returned pointer MAY BE NULL if the in-memory
   // database has not been loaded yet. This pointer is owned by the history
   // system. Callers should not store or cache this value.
   //
   // TODO(brettw) this should return the InMemoryHistoryBackend.
   history::URLDatabase* InMemoryDatabase();
 
   // Return the quick history index.
-  history::InMemoryURLIndex* InMemoryIndex();
+  history::InMemoryURLIndex* InMemoryIndex() const {
+    return in_memory_url_index_.get();
+  }
 
   // Navigation ----------------------------------------------------------------
 
   // Adds the given canonical URL to history with the current time as the visit
   // time. Referrer may be the empty string.
   //
   // The supplied render process host is used to scope the given page ID. Page
   // IDs are only unique inside a given render process, so we need that to
   // differentiate them. This pointer should not be dereferenced by the history
   // system. Since render view host pointers may be reused (if one gets deleted
@@ skipping 426 matching lines @@
  private:
   class BackendDelegate;
   friend class base::RefCountedThreadSafe<HistoryService>;
   friend class BackendDelegate;
   friend class FaviconService;
   friend class history::HistoryBackend;
   friend class history::HistoryQueryTest;
   friend class HistoryOperation;
   friend class HistoryURLProvider;
   friend class HistoryURLProviderTest;
+  friend class history::InMemoryURLIndexTest;
   template<typename Info, typename Callback> friend class DownloadRequest;
   friend class PageUsageRequest;
   friend class RedirectRequest;
   friend class TestingProfile;
 
   // Implementation of content::NotificationObserver.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
@@ skipping 255 matching lines @@
   int current_backend_id_;
 
   // Cached values from Init(), used whenever we need to reload the backend.
   FilePath history_dir_;
   BookmarkService* bookmark_service_;
   bool no_db_;
 
   // True if needs top site migration.
   bool needs_top_sites_migration_;
 
+  // The index used for quick history lookups.
+  scoped_ptr<history::InMemoryURLIndex> in_memory_url_index_;
+
   DISALLOW_COPY_AND_ASSIGN(HistoryService);
 };
 
 #endif  // CHROME_BROWSER_HISTORY_HISTORY_H_