Index: chrome/browser/history/history.cc |
=================================================================== |
--- chrome/browser/history/history.cc (revision 107963) |
+++ chrome/browser/history/history.cc (working copy) |
@@ -37,6 +37,7 @@ |
#include "chrome/browser/history/history_types.h" |
#include "chrome/browser/history/in_memory_database.h" |
#include "chrome/browser/history/in_memory_history_backend.h" |
+#include "chrome/browser/history/in_memory_url_index.h" |
#include "chrome/browser/history/top_sites.h" |
#include "chrome/browser/prefs/pref_service.h" |
#include "chrome/browser/profiles/profile.h" |
@@ -248,8 +249,8 @@ |
// LoadBackendIfNecessary() here even though it won't affect the return value |
// for this call. |
LoadBackendIfNecessary(); |
- if (in_memory_backend_.get()) |
- return in_memory_backend_->InMemoryIndex(); |
+ if (history_backend_.get()) |
+ return history_backend_->InMemoryIndex(); |
return NULL; |
} |
@@ -800,7 +801,8 @@ |
++current_backend_id_; |
scoped_refptr<HistoryBackend> backend( |
- new HistoryBackend(history_dir_, |
+ new HistoryBackend(profile_, |
+ history_dir_, |
current_backend_id_, |
new BackendDelegate(this, profile_), |
bookmark_service_)); |