Chromium Code Reviews| Index: components/omnibox/browser/in_memory_url_index.cc |
| diff --git a/components/omnibox/browser/in_memory_url_index.cc b/components/omnibox/browser/in_memory_url_index.cc |
| index c0273017dfd7f8d215338e43847846813c0696ea..3363bdcfb6f0ff8d5cb0574f03047ac9107f6d48 100644 |
| --- a/components/omnibox/browser/in_memory_url_index.cc |
| +++ b/components/omnibox/browser/in_memory_url_index.cc |
| @@ -45,10 +45,8 @@ InMemoryURLIndex::SaveCacheObserver::~SaveCacheObserver() { |
| InMemoryURLIndex::RebuildPrivateDataFromHistoryDBTask:: |
| RebuildPrivateDataFromHistoryDBTask( |
| InMemoryURLIndex* index, |
| - const std::string& languages, |
| const SchemeSet& scheme_whitelist) |
| : index_(index), |
| - languages_(languages), |
| scheme_whitelist_(scheme_whitelist), |
| succeeded_(false) { |
| } |
| @@ -56,8 +54,7 @@ InMemoryURLIndex::RebuildPrivateDataFromHistoryDBTask:: |
| bool InMemoryURLIndex::RebuildPrivateDataFromHistoryDBTask::RunOnDBThread( |
| history::HistoryBackend* backend, |
| history::HistoryDatabase* db) { |
| - data_ = URLIndexPrivateData::RebuildFromHistory(db, languages_, |
| - scheme_whitelist_); |
| + data_ = URLIndexPrivateData::RebuildFromHistory(db, scheme_whitelist_); |
| succeeded_ = data_.get() && !data_->Empty(); |
| if (!succeeded_ && data_.get()) |
| data_->Clear(); |
| @@ -81,13 +78,11 @@ InMemoryURLIndex::InMemoryURLIndex( |
| TemplateURLService* template_url_service, |
| base::SequencedWorkerPool* worker_pool, |
| const base::FilePath& history_dir, |
| - const std::string& languages, |
| const SchemeSet& client_schemes_to_whitelist) |
| : bookmark_model_(bookmark_model), |
| history_service_(history_service), |
| template_url_service_(template_url_service), |
| history_dir_(history_dir), |
| - languages_(languages), |
| private_data_(new URLIndexPrivateData), |
| restore_cache_observer_(NULL), |
| save_cache_observer_(NULL), |
| @@ -133,7 +128,7 @@ ScoredHistoryMatches InMemoryURLIndex::HistoryItemsForTerms( |
| size_t cursor_position, |
| size_t max_matches) { |
| return private_data_->HistoryItemsForTerms( |
| - term_string, cursor_position, max_matches, languages_, bookmark_model_, |
| + term_string, cursor_position, max_matches, bookmark_model_, |
| template_url_service_); |
| } |
| @@ -151,7 +146,6 @@ void InMemoryURLIndex::OnURLVisited(history::HistoryService* history_service, |
| DCHECK_EQ(history_service_, history_service); |
| needs_to_be_cached_ |= private_data_->UpdateURL(history_service_, |
| row, |
| - languages_, |
| scheme_whitelist_, |
| &private_data_tracker_); |
| } |
| @@ -162,7 +156,6 @@ void InMemoryURLIndex::OnURLsModified(history::HistoryService* history_service, |
| for (const auto& row : changed_urls) { |
| needs_to_be_cached_ |= private_data_->UpdateURL(history_service_, |
| row, |
| - languages_, |
| scheme_whitelist_, |
| &private_data_tracker_); |
| } |
| @@ -225,7 +218,7 @@ void InMemoryURLIndex::PostRestoreFromCacheFileTask() { |
| base::PostTaskAndReplyWithResult( |
| task_runner_.get(), |
| FROM_HERE, |
| - base::Bind(&URLIndexPrivateData::RestoreFromFile, path, languages_), |
| + base::Bind(&URLIndexPrivateData::RestoreFromFile, path), |
| base::Bind(&InMemoryURLIndex::OnCacheLoadDone, AsWeakPtr())); |
| } |
| @@ -284,7 +277,7 @@ void InMemoryURLIndex::ScheduleRebuildFromHistory() { |
| history_service_->ScheduleDBTask( |
| scoped_ptr<history::HistoryDBTask>( |
| new InMemoryURLIndex::RebuildPrivateDataFromHistoryDBTask( |
| - this, languages_, scheme_whitelist_)), |
| + this, scheme_whitelist_)), |
|
Peter Kasting
2016/04/05 02:42:32
Nit: Extra space
jungshik at Google
2016/04/05 18:56:19
Done.
|
| &cache_reader_tracker_); |
| } |
| @@ -310,7 +303,6 @@ void InMemoryURLIndex::RebuildFromHistory( |
| history::HistoryDatabase* history_db) { |
| private_data_tracker_.TryCancelAll(); |
| private_data_ = URLIndexPrivateData::RebuildFromHistory(history_db, |
| - languages_, |
| scheme_whitelist_); |
| } |