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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/history/core/browser/history_service.cc

Issue 2283373002: Remove unneeded scoped_refptr<>::get() on method binding (Closed)
Patch Set: Created 4 years, 4 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 | « components/history/core/browser/history_backend.cc ('k') | components/invalidation/impl/non_blocking_invalidator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/history/core/browser/history_service.cc
diff --git a/components/history/core/browser/history_service.cc b/components/history/core/browser/history_service.cc
index 284d3ea576c322f981cbefed1fa2311af645a431..fd3a29ec3ad865d45b593fa11d69397573ed8d85 100644
--- a/components/history/core/browser/history_service.cc
+++ b/components/history/core/browser/history_service.cc
@@ -226,7 +226,7 @@ void HistoryService::ClearCachedDataForContextID(ContextID context_id) {
DCHECK(thread_checker_.CalledOnValidThread());
ScheduleTask(PRIORITY_NORMAL,
base::Bind(&HistoryBackend::ClearCachedDataForContextID,
- history_backend_.get(), context_id));
+ history_backend_, context_id));
}
URLDatabase* HistoryService::InMemoryDatabase() {
@@ -250,7 +250,7 @@ void HistoryService::SetKeywordSearchTermsForURL(const GURL& url,
DCHECK(thread_checker_.CalledOnValidThread());
ScheduleTask(PRIORITY_UI,
base::Bind(&HistoryBackend::SetKeywordSearchTermsForURL,
- history_backend_.get(), url, keyword_id, term));
+ history_backend_, url, keyword_id, term));
}
void HistoryService::DeleteAllSearchTermsForKeyword(KeywordID keyword_id) {
@@ -262,7 +262,7 @@ void HistoryService::DeleteAllSearchTermsForKeyword(KeywordID keyword_id) {
ScheduleTask(PRIORITY_UI,
base::Bind(&HistoryBackend::DeleteAllSearchTermsForKeyword,
- history_backend_.get(), keyword_id));
+ history_backend_, keyword_id));
}
void HistoryService::DeleteKeywordSearchTermForURL(const GURL& url) {
@@ -270,7 +270,7 @@ void HistoryService::DeleteKeywordSearchTermForURL(const GURL& url) {
DCHECK(thread_checker_.CalledOnValidThread());
ScheduleTask(PRIORITY_UI,
base::Bind(&HistoryBackend::DeleteKeywordSearchTermForURL,
- history_backend_.get(), url));
+ history_backend_, url));
}
void HistoryService::DeleteMatchingURLsForKeyword(KeywordID keyword_id,
@@ -279,7 +279,7 @@ void HistoryService::DeleteMatchingURLsForKeyword(KeywordID keyword_id,
DCHECK(thread_checker_.CalledOnValidThread());
ScheduleTask(PRIORITY_UI,
base::Bind(&HistoryBackend::DeleteMatchingURLsForKeyword,
- history_backend_.get(), keyword_id, term));
+ history_backend_, keyword_id, term));
}
void HistoryService::URLsNoLongerBookmarked(const std::set<GURL>& urls) {
@@ -287,7 +287,7 @@ void HistoryService::URLsNoLongerBookmarked(const std::set<GURL>& urls) {
DCHECK(thread_checker_.CalledOnValidThread());
ScheduleTask(PRIORITY_NORMAL,
base::Bind(&HistoryBackend::URLsNoLongerBookmarked,
- history_backend_.get(), urls));
+ history_backend_, urls));
}
void HistoryService::AddObserver(HistoryServiceObserver* observer) {
@@ -313,7 +313,7 @@ base::CancelableTaskTracker::TaskId HistoryService::ScheduleDBTask(
// HistoryDBTask::DoneRunOnMainThread() in the correct thread.
thread_->task_runner()->PostTask(
FROM_HERE, base::Bind(&HistoryBackend::ProcessDBTask,
- history_backend_.get(), base::Passed(&task),
+ history_backend_, base::Passed(&task),
base::ThreadTaskRunnerHandle::Get(), is_canceled));
return task_id;
}
@@ -329,7 +329,7 @@ void HistoryService::SetOnBackendDestroyTask(const base::Closure& task) {
ScheduleTask(
PRIORITY_NORMAL,
base::Bind(&HistoryBackend::SetOnBackendDestroyTask,
- history_backend_.get(), base::MessageLoop::current(), task));
+ history_backend_, base::MessageLoop::current(), task));
}
void HistoryService::TopHosts(size_t num_hosts,
@@ -338,7 +338,7 @@ void HistoryService::TopHosts(size_t num_hosts,
DCHECK(thread_checker_.CalledOnValidThread());
PostTaskAndReplyWithResult(
thread_->task_runner().get(), FROM_HERE,
- base::Bind(&HistoryBackend::TopHosts, history_backend_.get(), num_hosts),
+ base::Bind(&HistoryBackend::TopHosts, history_backend_, num_hosts),
callback);
}
@@ -350,7 +350,7 @@ void HistoryService::GetCountsAndLastVisitForOrigins(
PostTaskAndReplyWithResult(
thread_->task_runner().get(), FROM_HERE,
base::Bind(&HistoryBackend::GetCountsAndLastVisitForOrigins,
- history_backend_.get(), origins),
+ history_backend_, origins),
callback);
}
@@ -361,7 +361,7 @@ void HistoryService::HostRankIfAvailable(
DCHECK(thread_checker_.CalledOnValidThread());
PostTaskAndReplyWithResult(thread_->task_runner().get(), FROM_HERE,
base::Bind(&HistoryBackend::HostRankIfAvailable,
- history_backend_.get(), url),
+ history_backend_, url),
callback);
}
@@ -414,7 +414,7 @@ void HistoryService::AddPage(const HistoryAddPageArgs& add_page_args) {
}
ScheduleTask(PRIORITY_NORMAL,
- base::Bind(&HistoryBackend::AddPage, history_backend_.get(),
+ base::Bind(&HistoryBackend::AddPage, history_backend_,
add_page_args));
}
@@ -427,7 +427,7 @@ void HistoryService::AddPageNoVisitForBookmark(const GURL& url,
ScheduleTask(PRIORITY_NORMAL,
base::Bind(&HistoryBackend::AddPageNoVisitForBookmark,
- history_backend_.get(), url, title));
+ history_backend_, url, title));
}
void HistoryService::SetPageTitle(const GURL& url,
@@ -435,7 +435,7 @@ void HistoryService::SetPageTitle(const GURL& url,
DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
ScheduleTask(PRIORITY_NORMAL, base::Bind(&HistoryBackend::SetPageTitle,
- history_backend_.get(), url, title));
+ history_backend_, url, title));
}
void HistoryService::UpdateWithPageEndTime(ContextID context_id,
@@ -446,7 +446,7 @@ void HistoryService::UpdateWithPageEndTime(ContextID context_id,
DCHECK(thread_checker_.CalledOnValidThread());
ScheduleTask(
PRIORITY_NORMAL,
- base::Bind(&HistoryBackend::UpdateWithPageEndTime, history_backend_.get(),
+ base::Bind(&HistoryBackend::UpdateWithPageEndTime, history_backend_,
context_id, nav_entry_id, url, end_ts));
}
@@ -479,7 +479,7 @@ void HistoryService::AddPageWithDetails(const GURL& url,
ScheduleTask(PRIORITY_NORMAL,
base::Bind(&HistoryBackend::AddPagesWithDetails,
- history_backend_.get(), rows, visit_source));
+ history_backend_, rows, visit_source));
}
void HistoryService::AddPagesWithDetails(const URLRows& info,
@@ -498,7 +498,7 @@ void HistoryService::AddPagesWithDetails(const URLRows& info,
ScheduleTask(PRIORITY_NORMAL,
base::Bind(&HistoryBackend::AddPagesWithDetails,
- history_backend_.get(), info, visit_source));
+ history_backend_, info, visit_source));
}
base::CancelableTaskTracker::TaskId HistoryService::GetFavicons(
@@ -513,7 +513,7 @@ base::CancelableTaskTracker::TaskId HistoryService::GetFavicons(
new std::vector<favicon_base::FaviconRawBitmapResult>();
return tracker->PostTaskAndReply(
thread_->task_runner().get(), FROM_HERE,
- base::Bind(&HistoryBackend::GetFavicons, history_backend_.get(),
+ base::Bind(&HistoryBackend::GetFavicons, history_backend_,
icon_urls, icon_types, desired_sizes, results),
base::Bind(&RunWithFaviconResults, callback, base::Owned(results)));
}
@@ -530,7 +530,7 @@ base::CancelableTaskTracker::TaskId HistoryService::GetFaviconsForURL(
new std::vector<favicon_base::FaviconRawBitmapResult>();
return tracker->PostTaskAndReply(
thread_->task_runner().get(), FROM_HERE,
- base::Bind(&HistoryBackend::GetFaviconsForURL, history_backend_.get(),
+ base::Bind(&HistoryBackend::GetFaviconsForURL, history_backend_,
page_url, icon_types, desired_sizes, results),
base::Bind(&RunWithFaviconResults, callback, base::Owned(results)));
}
@@ -548,7 +548,7 @@ base::CancelableTaskTracker::TaskId HistoryService::GetLargestFaviconForURL(
return tracker->PostTaskAndReply(
thread_->task_runner().get(), FROM_HERE,
base::Bind(&HistoryBackend::GetLargestFaviconForURL,
- history_backend_.get(), page_url, icon_types,
+ history_backend_, page_url, icon_types,
minimum_size_in_pixels, result),
base::Bind(&RunWithFaviconResult, callback, base::Owned(result)));
}
@@ -564,7 +564,7 @@ base::CancelableTaskTracker::TaskId HistoryService::GetFaviconForID(
new std::vector<favicon_base::FaviconRawBitmapResult>();
return tracker->PostTaskAndReply(
thread_->task_runner().get(), FROM_HERE,
- base::Bind(&HistoryBackend::GetFaviconForID, history_backend_.get(),
+ base::Bind(&HistoryBackend::GetFaviconForID, history_backend_,
favicon_id, desired_size, results),
base::Bind(&RunWithFaviconResults, callback, base::Owned(results)));
}
@@ -584,7 +584,7 @@ HistoryService::UpdateFaviconMappingsAndFetch(
return tracker->PostTaskAndReply(
thread_->task_runner().get(), FROM_HERE,
base::Bind(&HistoryBackend::UpdateFaviconMappingsAndFetch,
- history_backend_.get(), page_url, icon_urls, icon_types,
+ history_backend_, page_url, icon_urls, icon_types,
desired_sizes, results),
base::Bind(&RunWithFaviconResults, callback, base::Owned(results)));
}
@@ -602,7 +602,7 @@ void HistoryService::MergeFavicon(
ScheduleTask(
PRIORITY_NORMAL,
- base::Bind(&HistoryBackend::MergeFavicon, history_backend_.get(),
+ base::Bind(&HistoryBackend::MergeFavicon, history_backend_,
page_url, icon_url, icon_type, bitmap_data, pixel_size));
}
@@ -616,7 +616,7 @@ void HistoryService::SetFavicons(const GURL& page_url,
return;
ScheduleTask(PRIORITY_NORMAL,
- base::Bind(&HistoryBackend::SetFavicons, history_backend_.get(),
+ base::Bind(&HistoryBackend::SetFavicons, history_backend_,
page_url, icon_type, icon_url, bitmaps));
}
@@ -625,7 +625,7 @@ void HistoryService::SetFaviconsOutOfDateForPage(const GURL& page_url) {
DCHECK(thread_checker_.CalledOnValidThread());
ScheduleTask(PRIORITY_NORMAL,
base::Bind(&HistoryBackend::SetFaviconsOutOfDateForPage,
- history_backend_.get(), page_url));
+ history_backend_, page_url));
}
void HistoryService::SetImportedFavicons(
@@ -634,7 +634,7 @@ void HistoryService::SetImportedFavicons(
DCHECK(thread_checker_.CalledOnValidThread());
ScheduleTask(PRIORITY_NORMAL,
base::Bind(&HistoryBackend::SetImportedFavicons,
- history_backend_.get(), favicon_usage));
+ history_backend_, favicon_usage));
}
base::CancelableTaskTracker::TaskId HistoryService::QueryURL(
@@ -647,7 +647,7 @@ base::CancelableTaskTracker::TaskId HistoryService::QueryURL(
QueryURLResult* query_url_result = new QueryURLResult();
return tracker->PostTaskAndReply(
thread_->task_runner().get(), FROM_HERE,
- base::Bind(&HistoryBackend::QueryURL, history_backend_.get(), url,
+ base::Bind(&HistoryBackend::QueryURL, history_backend_, url,
want_visits, base::Unretained(query_url_result)),
base::Bind(&RunWithQueryURLResult, callback,
base::Owned(query_url_result)));
@@ -666,7 +666,7 @@ base::CancelableTaskTracker::TaskId HistoryService::GetHistoryCount(
return tracker->PostTaskAndReplyWithResult(
thread_->task_runner().get(), FROM_HERE,
base::Bind(&HistoryBackend::GetHistoryCount,
- history_backend_.get(),
+ history_backend_,
begin_time,
end_time),
callback);
@@ -683,7 +683,7 @@ void HistoryService::CreateDownload(
DCHECK(thread_checker_.CalledOnValidThread());
PostTaskAndReplyWithResult(thread_->task_runner().get(), FROM_HERE,
base::Bind(&HistoryBackend::CreateDownload,
- history_backend_.get(), create_info),
+ history_backend_, create_info),
callback);
}
@@ -692,7 +692,7 @@ void HistoryService::GetNextDownloadId(const DownloadIdCallback& callback) {
DCHECK(thread_checker_.CalledOnValidThread());
PostTaskAndReplyWithResult(
thread_->task_runner().get(), FROM_HERE,
- base::Bind(&HistoryBackend::GetNextDownloadId, history_backend_.get()),
+ base::Bind(&HistoryBackend::GetNextDownloadId, history_backend_),
callback);
}
@@ -709,7 +709,7 @@ void HistoryService::QueryDownloads(const DownloadQueryCallback& callback) {
// Bind's arguments.
thread_->task_runner()->PostTaskAndReply(
FROM_HERE,
- base::Bind(&HistoryBackend::QueryDownloads, history_backend_.get(), rows),
+ base::Bind(&HistoryBackend::QueryDownloads, history_backend_, rows),
base::Bind(callback, base::Passed(&scoped_rows)));
}
@@ -719,14 +719,14 @@ void HistoryService::UpdateDownload(const DownloadRow& data) {
DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
ScheduleTask(PRIORITY_NORMAL, base::Bind(&HistoryBackend::UpdateDownload,
- history_backend_.get(), data));
+ history_backend_, data));
}
void HistoryService::RemoveDownloads(const std::set<uint32_t>& ids) {
DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
ScheduleTask(PRIORITY_NORMAL, base::Bind(&HistoryBackend::RemoveDownloads,
- history_backend_.get(), ids));
+ history_backend_, ids));
}
base::CancelableTaskTracker::TaskId HistoryService::QueryHistory(
@@ -739,7 +739,7 @@ base::CancelableTaskTracker::TaskId HistoryService::QueryHistory(
QueryResults* query_results = new QueryResults();
return tracker->PostTaskAndReply(
thread_->task_runner().get(), FROM_HERE,
- base::Bind(&HistoryBackend::QueryHistory, history_backend_.get(),
+ base::Bind(&HistoryBackend::QueryHistory, history_backend_,
text_query, options, base::Unretained(query_results)),
base::Bind(callback, base::Owned(query_results)));
}
@@ -753,7 +753,7 @@ base::CancelableTaskTracker::TaskId HistoryService::QueryRedirectsFrom(
RedirectList* result = new RedirectList();
return tracker->PostTaskAndReply(
thread_->task_runner().get(), FROM_HERE,
- base::Bind(&HistoryBackend::QueryRedirectsFrom, history_backend_.get(),
+ base::Bind(&HistoryBackend::QueryRedirectsFrom, history_backend_,
from_url, base::Unretained(result)),
base::Bind(callback, base::Owned(result)));
}
@@ -767,7 +767,7 @@ base::CancelableTaskTracker::TaskId HistoryService::QueryRedirectsTo(
RedirectList* result = new RedirectList();
return tracker->PostTaskAndReply(
thread_->task_runner().get(), FROM_HERE,
- base::Bind(&HistoryBackend::QueryRedirectsTo, history_backend_.get(),
+ base::Bind(&HistoryBackend::QueryRedirectsTo, history_backend_,
to_url, base::Unretained(result)),
base::Bind(callback, base::Owned(result)));
}
@@ -782,7 +782,7 @@ base::CancelableTaskTracker::TaskId HistoryService::GetVisibleVisitCountToHost(
return tracker->PostTaskAndReply(
thread_->task_runner().get(), FROM_HERE,
base::Bind(&HistoryBackend::GetVisibleVisitCountToHost,
- history_backend_.get(), url, base::Unretained(result)),
+ history_backend_, url, base::Unretained(result)),
base::Bind(&RunWithVisibleVisitCountToHostResult, callback,
base::Owned(result)));
}
@@ -797,7 +797,7 @@ base::CancelableTaskTracker::TaskId HistoryService::QueryMostVisitedURLs(
MostVisitedURLList* result = new MostVisitedURLList();
return tracker->PostTaskAndReply(
thread_->task_runner().get(), FROM_HERE,
- base::Bind(&HistoryBackend::QueryMostVisitedURLs, history_backend_.get(),
+ base::Bind(&HistoryBackend::QueryMostVisitedURLs, history_backend_,
result_count, days_back, base::Unretained(result)),
base::Bind(callback, base::Owned(result)));
}
@@ -844,7 +844,7 @@ void HistoryService::Cleanup() {
// See http://crbug.com/99767.
history_backend_->AddRef();
base::Closure closing_task =
- base::Bind(&HistoryBackend::Closing, history_backend_.get());
+ base::Bind(&HistoryBackend::Closing, history_backend_);
ScheduleTask(PRIORITY_NORMAL, closing_task);
closing_task.Reset();
HistoryBackend* raw_ptr = history_backend_.get();
@@ -884,7 +884,7 @@ bool HistoryService::Init(
history_backend_.swap(backend);
ScheduleTask(PRIORITY_UI,
- base::Bind(&HistoryBackend::Init, history_backend_.get(),
+ base::Bind(&HistoryBackend::Init, history_backend_,
no_db, history_database_params));
if (visit_delegate_ && !visit_delegate_->Init(this))
@@ -900,7 +900,7 @@ void HistoryService::ScheduleAutocomplete(
const base::Callback<void(HistoryBackend*, URLDatabase*)>& callback) {
DCHECK(thread_checker_.CalledOnValidThread());
ScheduleTask(PRIORITY_UI, base::Bind(&HistoryBackend::ScheduleAutocomplete,
- history_backend_.get(), callback));
+ history_backend_, callback));
}
void HistoryService::ScheduleTask(SchedulePriority priority,
@@ -979,7 +979,7 @@ void HistoryService::DeleteURL(const GURL& url) {
DCHECK(thread_checker_.CalledOnValidThread());
// We will update the visited links when we observe the delete notifications.
ScheduleTask(PRIORITY_NORMAL, base::Bind(&HistoryBackend::DeleteURL,
- history_backend_.get(), url));
+ history_backend_, url));
}
void HistoryService::DeleteURLsForTest(const std::vector<GURL>& urls) {
@@ -988,7 +988,7 @@ void HistoryService::DeleteURLsForTest(const std::vector<GURL>& urls) {
// We will update the visited links when we observe the delete
// notifications.
ScheduleTask(PRIORITY_NORMAL, base::Bind(&HistoryBackend::DeleteURLs,
- history_backend_.get(), urls));
+ history_backend_, urls));
}
void HistoryService::ExpireHistoryBetween(
« no previous file with comments | « components/history/core/browser/history_backend.cc ('k') | components/invalidation/impl/non_blocking_invalidator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698