diff options
author | sdefresne@chromium.org <sdefresne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-25 10:07:55 +0000 |
---|---|---|
committer | sdefresne@chromium.org <sdefresne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-25 10:07:55 +0000 |
commit | 91445739262379e6bee3ef15244c30a59e63dbb5 (patch) | |
tree | e4e37495b9d10afde250b7c309756303b6b0f956 /chrome/test/base/ui_test_utils.h | |
parent | f19f5bb8d05fcc2d5aac649576ea8f5a9da23ef3 (diff) | |
download | chromium_src-91445739262379e6bee3ef15244c30a59e63dbb5.zip chromium_src-91445739262379e6bee3ef15244c30a59e63dbb5.tar.gz chromium_src-91445739262379e6bee3ef15244c30a59e63dbb5.tar.bz2 |
Port HistoryService::QueryHistory to use CancelableTaskTracker
The callback no longer receive a HistoryService::Handle as a parameter
but just the QueryResults. HistoryService::QueryHistory instead return
a CancelableTaskTracker::TaskId that should be used to cancel the task.
BUG=371818
TBR=mek@chromium.org
TBR=gab@chromium.org
TBR=bauerb@chromium.org
TBR=rohitrao@chromium.org
TBR=zea@chromium.org
TBR=jcivelli@chromium.org
Review URL: https://codereview.chromium.org/343573003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279658 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base/ui_test_utils.h')
-rw-r--r-- | chrome/test/base/ui_test_utils.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/test/base/ui_test_utils.h b/chrome/test/base/ui_test_utils.h index 8ed553a..7c15ce8 100644 --- a/chrome/test/base/ui_test_utils.h +++ b/chrome/test/base/ui_test_utils.h @@ -301,12 +301,11 @@ class HistoryEnumerator { private: void HistoryQueryComplete( const base::Closure& quit_task, - HistoryService::Handle request_handle, history::QueryResults* results); std::vector<GURL> urls_; - CancelableRequestConsumer consumer_; + base::CancelableTaskTracker tracker_; DISALLOW_COPY_AND_ASSIGN(HistoryEnumerator); }; |