Revert 56962 - Next step integrating the HistoryQuickProvider: Implement inde...

chrome/browser/history/in_memory_history_backend.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/history/in_memory_history_backend.h"
 
 #include "base/command_line.h"
 #include "base/histogram.h"
 #include "base/time.h"
-#include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/in_memory_database.h"
 #include "chrome/browser/history/in_memory_url_index.h"
 #include "chrome/browser/history/url_database.h"
-#include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/common/pref_names.h"
 
 namespace history {
 
 // If a page becomes starred we use this id in place of the real starred id.
 // See note in OnURLsStarred.
 static const StarID kBogusStarredID = 0x0FFFFFFF;
 
 InMemoryHistoryBackend::InMemoryHistoryBackend()
     : profile_(NULL) {
 }
 
 InMemoryHistoryBackend::~InMemoryHistoryBackend() {
 }
 
 bool InMemoryHistoryBackend::Init(const FilePath& history_filename,
                                   URLDatabase* db) {
   db_.reset(new InMemoryDatabase);
   bool success = db_->InitFromDisk(history_filename);
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableInMemoryURLIndex)) {
-    index_.reset(new InMemoryURLIndex());
+    index_.reset(new InMemoryURLIndex);
     base::TimeTicks beginning_time = base::TimeTicks::Now();
-    string16 languages =
-        UTF8ToUTF16(profile_->GetPrefs()->GetString(prefs::kAcceptLanguages));
-    index_->Init(db, languages);
+    index_->Init(db);
     UMA_HISTOGRAM_TIMES("Autocomplete.HistoryDatabaseIndexingTime",
                         base::TimeTicks::Now() - beginning_time);
   }
 
   return success;
 }
 
 void InMemoryHistoryBackend::AttachToHistoryService(Profile* profile) {
   if (!db_.get()) {
     NOTREACHED();
@@ skipping 81 matching lines @@
     URLID id = db_->GetRowForURL(*i, NULL);
     if (id) {
       // We typically won't have most of them since we only have a subset of
       // history, so ignore errors.
       db_->DeleteURLRow(id);
     }
   }
 }
 
 }  // namespace history