chrome/browser/history/android/sqlite_cursor.h - Issue 366133003: Change AndroidHistoryProviderService to use CancelableTaskTracker (3/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/android/sqlite_cursor.h

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

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/android/sqlite_cursor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/history/android/sqlite_cursor.h

diff --git a/chrome/browser/history/android/sqlite_cursor.h b/chrome/browser/history/android/sqlite_cursor.h

index b4cf8f67c26279225720638ac87b609bc04bb8ef..48edc671348375e079f511f897b454f12dd2d509 100644

--- a/chrome/browser/history/android/sqlite_cursor.h

+++ b/chrome/browser/history/android/sqlite_cursor.h

@@ -15,7 +15,6 @@

#include "base/strings/string16.h"

#include "base/synchronization/waitable_event.h"

#include "base/task/cancelable_task_tracker.h"

-#include "chrome/browser/common/cancelable_request.h"

#include "chrome/browser/history/android/android_history_provider_service.h"

#include "chrome/browser/history/history_types.h"

#include "components/favicon_base/favicon_callback.h"

@@ -159,7 +158,7 @@ class SQLiteCursor {

void OnFaviconData(const favicon_base::FaviconRawBitmapResult& bitmap_result);

// The callback function of MoveTo().

- void OnMoved(AndroidHistoryProviderService::Handle handle, int pos);

+ void OnMoved(int pos);

JavaColumnType GetColumnTypeInternal(int column);

@@ -182,7 +181,6 @@ class SQLiteCursor {

FaviconService* favicon_service_;

// Live on UI thread.

- scoped_ptr<CancelableRequestConsumer> consumer_;

scoped_ptr<base::CancelableTaskTracker> tracker_;

// The count of result rows.