chrome/browser/history/history_backend.h - Issue 368283003: Change AndroidHistoryProviderService to use CancelableTaskTracker (5/6)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/history/history_backend.h

Issue 368283003: Change AndroidHistoryProviderService to use CancelableTaskTracker (5/6) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cancelable_task_tracker.5

Patch Set: Fix unit tests Created 6 years, 5 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/android/android_history_provider_service_unittest.cc ('k') | chrome/browser/history/history_backend_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/history/history_backend.h

diff --git a/chrome/browser/history/history_backend.h b/chrome/browser/history/history_backend.h

index b4650f0edb876a6c61740f6819c252271a4684e7..46273e2dff9cad745b382c8265809602c905a2d2 100644

--- a/chrome/browser/history/history_backend.h

+++ b/chrome/browser/history/history_backend.h

@@ -301,8 +301,12 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,

const std::vector<base::string16>& selection_args,

const std::string& sort_order);

- void UpdateHistoryAndBookmarks(

- scoped_refptr<UpdateRequest> request,

+ // Returns the number of row updated by the update query.

+ //

+ // |row| is the value to update.

+ // |selection| is the SQL WHERE clause without 'WHERE'.

+ // |selection_args| is the arguments for the WHERE clause.

+ int UpdateHistoryAndBookmarks(

const HistoryAndBookmarkRow& row,

const std::string& selection,

const std::vector<base::string16>& selection_args);

@@ -329,10 +333,14 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,

// Inserts the given values and returns the SearchTermID of the inserted row.

SearchTermID InsertSearchTerm(const SearchRow& row);

- void UpdateSearchTerms(scoped_refptr<UpdateRequest> request,

- const SearchRow& row,

- const std::string& selection,

- const std::vector<base::string16> selection_args);

+ // Returns the number of row updated by the update query.

+ //

+ // |row| is the value to update.

+ // |selection| is the SQL WHERE clause without 'WHERE'.

+ // |selection_args| is the arguments for the WHERE clause.

+ int UpdateSearchTerms(const SearchRow& row,

+ const std::string& selection,

+ const std::vector<base::string16> selection_args);

void DeleteSearchTerms(scoped_refptr<DeleteRequest> request,

const std::string& selection,