Remove dependencies of InMemoryURLIndex on Profile

chrome/browser/history/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_HISTORY_IN_MEMORY_URL_INDEX_H_
 #define CHROME_BROWSER_HISTORY_IN_MEMORY_URL_INDEX_H_
 
 #include <functional>
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "base/scoped_observer.h"
 #include "base/strings/string16.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/history/scored_history_match.h"
 #include "components/history/core/browser/history_db_task.h"
 #include "components/history/core/browser/history_service_observer.h"
 #include "components/history/core/browser/history_types.h"
 #include "sql/connection.h"
 
 class HistoryService;
 class HistoryQuickProviderTest;
-class Profile;
 
 namespace base {
 class Time;
 }
 
 namespace in_memory_url_index {
 class InMemoryURLIndexCacheItem;
 }
 
 namespace history {
@@ skipping 43 matching lines @@
   // the index's private data to the cache file.
   class SaveCacheObserver {
    public:
     virtual ~SaveCacheObserver();
 
     // Callback that lets the observer know that the save succeeded.
     // This is called on the UI thread.
     virtual void OnCacheSaveFinished(bool succeeded) = 0;
   };
 
-  // |profile|, which may be NULL during unit testing, is used to register for
-  // history changes. |history_dir| is a path to the directory containing the
-  // history database within the profile wherein the cache and transaction
-  // journals will be stored. |languages| gives a list of language encodings by
-  // which URLs and omnibox searches are broken down into words and characters.
-  InMemoryURLIndex(Profile* profile,
-                   HistoryService* history_service,
+  // |history_service| which may be null during unit testing is used to register
+  // |as an HistoryServiceObserver. |history_dir| is a path to the directory
+  // containing the history database within the profile wherein the cache and
+  // transaction journals will be stored. |languages| gives a list of language
+  // encodings by which URLs and omnibox searches are broken down into words and
+  // characters.
+  InMemoryURLIndex(HistoryService* history_service,
                    const base::FilePath& history_dir,
                    const std::string& languages,
                    HistoryClient* client);
   ~InMemoryURLIndex() override;
 
   // Opens and prepares the index of historical URL visits. If the index private
   // data cannot be restored from its cache file then it is rebuilt from the
   // history database.
   void Init();
 
@@ skipping 30 matching lines @@
     return restored_;
   }
 
  private:
   friend class ::HistoryQuickProviderTest;
   friend class InMemoryURLIndexTest;
   friend class InMemoryURLIndexCacheTest;
   FRIEND_TEST_ALL_PREFIXES(InMemoryURLIndexTest, ExpireRow);
   FRIEND_TEST_ALL_PREFIXES(LimitedInMemoryURLIndexTest, Initialization);
 
-  // Creating one of me without a history path is not allowed (tests excepted).
-  InMemoryURLIndex();
-
   // HistoryDBTask used to rebuild our private data from the history database.
   class RebuildPrivateDataFromHistoryDBTask : public HistoryDBTask {
    public:
     explicit RebuildPrivateDataFromHistoryDBTask(
         InMemoryURLIndex* index,
         const std::string& languages,
         const std::set<std::string>& scheme_whitelist);
 
     bool RunOnDBThread(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::string languages_;    // Languages for word-breaking.
     std::set<std::string> scheme_whitelist_;  // Schemes to be indexed.
     bool succeeded_;  // Indicates if the rebuild was successful.
     scoped_refptr<URLIndexPrivateData> data_;  // The rebuilt private data.
 
     DISALLOW_COPY_AND_ASSIGN(RebuildPrivateDataFromHistoryDBTask);
   };
 
   // Initializes all index data members in preparation for restoring the index
   // from the cache or a complete rebuild from the history database.
   void ClearPrivateData();
 
   // Constructs a file path for the cache file within the same directory where
   // the history database is kept and saves that path to |file_path|. Returns
   // true if |file_path| can be successfully constructed. (This function
   // provided as a hook for unit testing.)
   bool GetCacheFilePath(base::FilePath* file_path);
 
-  // Restores the index's private data from the cache file stored in the
-  // profile directory.
+  // Restores the index's private data from the cache file stored in the history
+  // directory.
   void PostRestoreFromCacheFileTask();
 
   // Schedules a history task to rebuild our private data from the history
   // database.
   void ScheduleRebuildFromHistory();
 
   // 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.
@@ skipping 12 matching lines @@
   // |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 profile directory.
+  // 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);
 
@@ skipping 23 matching lines @@
 
   // Returns a pointer to our private data cancelable request tracker. For
   // unit testing only.
   base::CancelableTaskTracker* private_data_tracker() {
     return &private_data_tracker_;
   }
 
   // Returns the set of whitelisted schemes. For unit testing only.
   const std::set<std::string>& scheme_whitelist() { return scheme_whitelist_; }
 
-  // The profile, may be null when testing.
-  Profile* profile_;
+  // The HistoryService; may be null when testing.
   HistoryService* history_service_;
 
-  // The HistoryClient; may be NULL when testing.
+  // The HistoryClient; may be null when testing.
   HistoryClient* history_client_;
 
   // Directory where cache file resides. This is, except when unit testing,
-  // the same directory in which the profile's history database is found. It
-  // should never be empty.
+  // the same directory in which the history database is found. It should never
+  // be empty.
   base::FilePath history_dir_;
 
   // Languages used during the word-breaking process during indexing.
   std::string languages_;
 
   // Only URLs with a whitelisted scheme are indexed.
   std::set<std::string> scheme_whitelist_;
 
   // The index's durable private data.
   scoped_refptr<URLIndexPrivateData> private_data_;
@@ skipping 10 matching lines @@
 
   // Set to true once the index restoration is complete.
   bool restored_;
 
   // Set to true when changes to the index have been made and the index needs
   // to be cached. Set to false when the index has been cached. Used as a
   // temporary safety check to insure that the cache is saved before the
   // index has been destructed.
   bool needs_to_be_cached_;
 
-  ScopedObserver<HistoryService, HistoryServiceObserver>
-      history_service_observer_;
-
   DISALLOW_COPY_AND_ASSIGN(InMemoryURLIndex);
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_IN_MEMORY_URL_INDEX_H_