Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1596)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/history/history_service.cc

Issue 369503007: Remove dead code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/history/history_service.h ('k') | chrome/browser/history/history_unittest.cc » ('j') | chrome/browser/history/top_sites_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/history/history_service.cc
diff --git a/chrome/browser/history/history_service.cc b/chrome/browser/history/history_service.cc
index 74b9c1fdb5fb9ff6929a63cea1f48717ff006283..8475fdb88e92c7ddafd493d9b2d289ba2d296bf8 100644
--- a/chrome/browser/history/history_service.cc
+++ b/chrome/browser/history/history_service.cc
@@ -292,6 +292,7 @@ void HistoryService::Cleanup() {
void HistoryService::ClearCachedDataForContextID(
history::ContextID context_id) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
ScheduleAndForget(PRIORITY_NORMAL,
&HistoryBackend::ClearCachedDataForContextID, context_id);
@@ -343,6 +344,7 @@ void HistoryService::Shutdown() {
void HistoryService::SetKeywordSearchTermsForURL(const GURL& url,
KeywordID keyword_id,
const base::string16& term) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
ScheduleAndForget(PRIORITY_UI,
&HistoryBackend::SetKeywordSearchTermsForURL,
@@ -350,6 +352,7 @@ void HistoryService::SetKeywordSearchTermsForURL(const GURL& url,
}
void HistoryService::DeleteAllSearchTermsForKeyword(KeywordID keyword_id) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
in_memory_backend_->DeleteAllSearchTermsForKeyword(keyword_id);
@@ -360,6 +363,7 @@ void HistoryService::DeleteAllSearchTermsForKeyword(KeywordID keyword_id) {
}
void HistoryService::DeleteKeywordSearchTermForURL(const GURL& url) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
ScheduleAndForget(PRIORITY_UI, &HistoryBackend::DeleteKeywordSearchTermForURL,
url);
@@ -367,12 +371,14 @@ void HistoryService::DeleteKeywordSearchTermForURL(const GURL& url) {
void HistoryService::DeleteMatchingURLsForKeyword(KeywordID keyword_id,
const base::string16& term) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
ScheduleAndForget(PRIORITY_UI, &HistoryBackend::DeleteMatchingURLsForKeyword,
keyword_id, term);
}
void HistoryService::URLsNoLongerBookmarked(const std::set<GURL>& urls) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
ScheduleAndForget(PRIORITY_NORMAL, &HistoryBackend::URLsNoLongerBookmarked,
urls);
@@ -380,6 +386,7 @@ void HistoryService::URLsNoLongerBookmarked(const std::set<GURL>& urls) {
void HistoryService::ScheduleDBTask(scoped_refptr<history::HistoryDBTask> task,
base::CancelableTaskTracker* tracker) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
base::CancelableTaskTracker::IsCanceledCallback is_canceled;
tracker->NewTrackedTaskId(&is_canceled);
@@ -401,6 +408,7 @@ void HistoryService::FlushForTest(const base::Closure& flushed) {
}
void HistoryService::SetOnBackendDestroyTask(const base::Closure& task) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
ScheduleAndForget(PRIORITY_NORMAL, &HistoryBackend::SetOnBackendDestroyTask,
base::MessageLoop::current(), task);
@@ -434,8 +442,8 @@ void HistoryService::AddPage(const GURL& url,
}
void HistoryService::AddPage(const history::HistoryAddPageArgs& add_page_args) {
- DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(thread_) << "History service being called after cleanup";
+ DCHECK(thread_checker_.CalledOnValidThread());
// Filter out unwanted URLs. We don't add auto-subframe URLs. They are a
// large part of history (think iframes for ads) and we never display them in
@@ -465,6 +473,7 @@ void HistoryService::AddPage(const history::HistoryAddPageArgs& add_page_args) {
void HistoryService::AddPageNoVisitForBookmark(const GURL& url,
const base::string16& title) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
if (!CanAddURL(url))
return;
@@ -475,6 +484,7 @@ void HistoryService::AddPageNoVisitForBookmark(const GURL& url,
void HistoryService::SetPageTitle(const GURL& url,
const base::string16& title) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
ScheduleAndForget(PRIORITY_NORMAL, &HistoryBackend::SetPageTitle, url, title);
}
@@ -483,6 +493,7 @@ void HistoryService::UpdateWithPageEndTime(history::ContextID context_id,
int32 page_id,
const GURL& url,
Time end_ts) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
ScheduleAndForget(PRIORITY_NORMAL, &HistoryBackend::UpdateWithPageEndTime,
context_id, page_id, url, end_ts);
@@ -495,6 +506,7 @@ void HistoryService::AddPageWithDetails(const GURL& url,
Time last_visit,
bool hidden,
history::VisitSource visit_source) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
// Filter out unwanted URLs.
if (!CanAddURL(url))
@@ -520,6 +532,7 @@ void HistoryService::AddPageWithDetails(const GURL& url,
void HistoryService::AddPagesWithDetails(const history::URLRows& info,
history::VisitSource visit_source) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
// Add to the visited links system.
if (visitedlink_master_) {
@@ -542,8 +555,8 @@ base::CancelableTaskTracker::TaskId HistoryService::GetFavicons(
const std::vector<int>& desired_sizes,
const favicon_base::FaviconResultsCallback& callback,
base::CancelableTaskTracker* tracker) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
-
std::vector<favicon_base::FaviconRawBitmapResult>* results =
new std::vector<favicon_base::FaviconRawBitmapResult>();
return tracker->PostTaskAndReply(
@@ -564,8 +577,8 @@ base::CancelableTaskTracker::TaskId HistoryService::GetFaviconsForURL(
const std::vector<int>& desired_sizes,
const favicon_base::FaviconResultsCallback& callback,
base::CancelableTaskTracker* tracker) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
-
std::vector<favicon_base::FaviconRawBitmapResult>* results =
new std::vector<favicon_base::FaviconRawBitmapResult>();
return tracker->PostTaskAndReply(
@@ -586,8 +599,8 @@ base::CancelableTaskTracker::TaskId HistoryService::GetLargestFaviconForURL(
int minimum_size_in_pixels,
const favicon_base::FaviconRawBitmapCallback& callback,
base::CancelableTaskTracker* tracker) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
-
favicon_base::FaviconRawBitmapResult* result =
new favicon_base::FaviconRawBitmapResult();
return tracker->PostTaskAndReply(
@@ -607,8 +620,8 @@ base::CancelableTaskTracker::TaskId HistoryService::GetFaviconForID(
int desired_size,
const favicon_base::FaviconResultsCallback& callback,
base::CancelableTaskTracker* tracker) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
-
std::vector<favicon_base::FaviconRawBitmapResult>* results =
new std::vector<favicon_base::FaviconRawBitmapResult>();
return tracker->PostTaskAndReply(
@@ -630,8 +643,8 @@ HistoryService::UpdateFaviconMappingsAndFetch(
const std::vector<int>& desired_sizes,
const favicon_base::FaviconResultsCallback& callback,
base::CancelableTaskTracker* tracker) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
-
std::vector<favicon_base::FaviconRawBitmapResult>* results =
new std::vector<favicon_base::FaviconRawBitmapResult>();
return tracker->PostTaskAndReply(
@@ -653,6 +666,7 @@ void HistoryService::MergeFavicon(
favicon_base::IconType icon_type,
scoped_refptr<base::RefCountedMemory> bitmap_data,
const gfx::Size& pixel_size) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
if (!CanAddURL(page_url))
return;
@@ -666,6 +680,7 @@ void HistoryService::SetFavicons(
favicon_base::IconType icon_type,
const std::vector<favicon_base::FaviconRawBitmapData>&
favicon_bitmap_data) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
if (!CanAddURL(page_url))
return;
@@ -675,6 +690,7 @@ void HistoryService::SetFavicons(
}
void HistoryService::SetFaviconsOutOfDateForPage(const GURL& page_url) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
ScheduleAndForget(PRIORITY_NORMAL,
&HistoryBackend::SetFaviconsOutOfDateForPage, page_url);
@@ -682,6 +698,7 @@ void HistoryService::SetFaviconsOutOfDateForPage(const GURL& page_url) {
void HistoryService::CloneFavicons(const GURL& old_page_url,
const GURL& new_page_url) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
ScheduleAndForget(PRIORITY_NORMAL, &HistoryBackend::CloneFavicons,
old_page_url, new_page_url);
@@ -689,6 +706,7 @@ void HistoryService::CloneFavicons(const GURL& old_page_url,
void HistoryService::SetImportedFavicons(
const std::vector<ImportedFaviconUsage>& favicon_usage) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
ScheduleAndForget(PRIORITY_NORMAL,
&HistoryBackend::SetImportedFavicons, favicon_usage);
@@ -699,6 +717,7 @@ base::CancelableTaskTracker::TaskId HistoryService::QueryURL(
bool want_visits,
const QueryURLCallback& callback,
base::CancelableTaskTracker* tracker) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
history::QueryURLResult* query_url_result = new history::QueryURLResult();
return tracker->PostTaskAndReply(
@@ -761,11 +780,13 @@ void HistoryService::QueryDownloads(
// Handle updates for a particular download. This is a 'fire and forget'
// operation, so we don't need to be called back.
void HistoryService::UpdateDownload(const history::DownloadRow& data) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
ScheduleAndForget(PRIORITY_NORMAL, &HistoryBackend::UpdateDownload, data);
}
void HistoryService::RemoveDownloads(const std::set<uint32>& ids) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
ScheduleAndForget(PRIORITY_NORMAL,
&HistoryBackend::RemoveDownloads, ids);
@@ -776,6 +797,7 @@ base::CancelableTaskTracker::TaskId HistoryService::QueryHistory(
const history::QueryOptions& options,
const QueryHistoryCallback& callback,
base::CancelableTaskTracker* tracker) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
history::QueryResults* query_results = new history::QueryResults();
return tracker->PostTaskAndReply(
@@ -793,6 +815,7 @@ base::CancelableTaskTracker::TaskId HistoryService::QueryRedirectsFrom(
const GURL& from_url,
const QueryRedirectsCallback& callback,
base::CancelableTaskTracker* tracker) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
history::RedirectList* result = new history::RedirectList();
return tracker->PostTaskAndReply(
@@ -809,6 +832,7 @@ base::CancelableTaskTracker::TaskId HistoryService::QueryRedirectsTo(
const GURL& to_url,
const QueryRedirectsCallback& callback,
base::CancelableTaskTracker* tracker) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
history::RedirectList* result = new history::RedirectList();
return tracker->PostTaskAndReply(thread_->message_loop_proxy().get(),
@@ -824,6 +848,7 @@ base::CancelableTaskTracker::TaskId HistoryService::GetVisibleVisitCountToHost(
const GURL& url,
const GetVisibleVisitCountToHostCallback& callback,
base::CancelableTaskTracker* tracker) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
history::VisibleVisitCountToHostResult* result =
new history::VisibleVisitCountToHostResult();
@@ -844,6 +869,7 @@ base::CancelableTaskTracker::TaskId HistoryService::QueryMostVisitedURLs(
int days_back,
const QueryMostVisitedURLsCallback& callback,
base::CancelableTaskTracker* tracker) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
history::MostVisitedURLList* result = new history::MostVisitedURLList();
return tracker->PostTaskAndReply(
@@ -863,6 +889,7 @@ base::CancelableTaskTracker::TaskId HistoryService::QueryFilteredURLs(
bool extended_info,
const QueryFilteredURLsCallback& callback,
base::CancelableTaskTracker* tracker) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
history::FilteredURLList* result = new history::FilteredURLList();
return tracker->PostTaskAndReply(
@@ -915,11 +942,13 @@ void HistoryService::Observe(int type,
void HistoryService::RebuildTable(
const scoped_refptr<URLEnumerator>& enumerator) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
ScheduleAndForget(PRIORITY_NORMAL, &HistoryBackend::IterateURLs, enumerator);
}
bool HistoryService::Init(const base::FilePath& history_dir, bool no_db) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
if (!thread_->Start()) {
Cleanup();
@@ -965,6 +994,7 @@ bool HistoryService::Init(const base::FilePath& history_dir, bool no_db) {
void HistoryService::ScheduleAutocomplete(HistoryURLProvider* provider,
HistoryURLProviderParams* params) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
ScheduleAndForget(PRIORITY_UI, &HistoryBackend::ScheduleAutocomplete,
scoped_refptr<HistoryURLProvider>(provider), params);
@@ -1066,12 +1096,14 @@ void HistoryService::NotifyProfileError(sql::InitStatus init_status) {
}
void HistoryService::DeleteURL(const GURL& url) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
// We will update the visited links when we observe the delete notifications.
ScheduleAndForget(PRIORITY_NORMAL, &HistoryBackend::DeleteURL, url);
}
void HistoryService::DeleteURLsForTest(const std::vector<GURL>& urls) {
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
// We will update the visited links when we observe the delete
// notifications.
@@ -1084,9 +1116,8 @@ void HistoryService::ExpireHistoryBetween(
Time end_time,
const base::Closure& callback,
base::CancelableTaskTracker* tracker) {
- DCHECK(thread_);
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
- DCHECK(history_backend_.get());
tracker->PostTaskAndReply(thread_->message_loop_proxy().get(),
FROM_HERE,
base::Bind(&HistoryBackend::ExpireHistoryBetween,
@@ -1101,9 +1132,8 @@ void HistoryService::ExpireHistory(
const std::vector<history::ExpireHistoryArgs>& expire_list,
const base::Closure& callback,
base::CancelableTaskTracker* tracker) {
- DCHECK(thread_);
+ DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
- DCHECK(history_backend_.get());
tracker->PostTaskAndReply(
thread_->message_loop_proxy().get(),
FROM_HERE,
« no previous file with comments | « chrome/browser/history/history_service.h ('k') | chrome/browser/history/history_unittest.cc » ('j') | chrome/browser/history/top_sites_impl.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698