diff options
| author | feng@chromium.org <feng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-12 22:13:54 +0000 |
|---|---|---|
| committer | feng@chromium.org <feng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-12 22:13:54 +0000 |
| commit | 057d79f4f356171e9019da02507a74088a3b9466 (patch) | |
| tree | bc640ca20017daf4da0ea875b55b907acccda5eb /chrome/browser/browsing_data | |
| parent | 7d9b0ba4cdccb00384edb73665df4e179a305dd2 (diff) | |
| download | chromium_src-057d79f4f356171e9019da02507a74088a3b9466.zip chromium_src-057d79f4f356171e9019da02507a74088a3b9466.tar.gz chromium_src-057d79f4f356171e9019da02507a74088a3b9466.tar.bz2 | |
Revert of Change HistoryService::QueryURL to use CancelableTaskTracker (https://codereview.chromium.org/314293005/)
Reason for revert:
Break Clank ToT build:
https://uberchromegw.corp.google.com/i/clank.tot/builders/instrumentation-yakju-clankium-tot/builds/29577/steps/compile/logs/stdio
Original issue's description:
> Change HistoryService::QueryURL to use CancelableTaskTracker
>
> The callback no longer receive an HistoryService::Handle as first parameter
> and the caller should use the returned base::CancelableTaskTrasker::TaskId
> to cancel a request early.
>
> Instead of passing a CancelableRequestConsumer to the query, the caller
> pass a base::CancelableTaskTracker. The lifetime of the callback can be
> associated to the request by using base::Passed().
>
> Remove unused types and fix usage of the values passed to the result
> callback (check success before using the URLRow or the VisitVector).
>
> BUG=371818
> TBR=bauerb,sky,asargent,gavinp,shess,pkasting
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=276739
TBR=blundell@chromium.org,bauerb@chromium.org,sky@chromium.org,asargent@chromium.org,gavinp@chromium.org,shess@chromium.org,pkasting@chromium.org,sdefresne@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=371818
Review URL: https://codereview.chromium.org/330703005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276825 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browsing_data')
| -rw-r--r-- | chrome/browser/browsing_data/browsing_data_remover_unittest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc index 29c3595..349ae04 100644 --- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc +++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc @@ -15,7 +15,6 @@ #include "base/message_loop/message_loop.h" #include "base/prefs/testing_pref_service.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/cancelable_task_tracker.h" #include "chrome/browser/autofill/personal_data_manager_factory.h" #include "chrome/browser/browsing_data/browsing_data_helper.h" #include "chrome/browser/browsing_data/browsing_data_remover_test_util.h" @@ -385,9 +384,9 @@ class RemoveHistoryTester { history_service_->QueryURL( url, true, + &consumer_, base::Bind(&RemoveHistoryTester::SaveResultAndQuit, - base::Unretained(this)), - &tracker_); + base::Unretained(this))); message_loop_runner->Run(); return query_url_success_; } @@ -400,15 +399,16 @@ class RemoveHistoryTester { private: // Callback for HistoryService::QueryURL. - void SaveResultAndQuit(bool success, - const history::URLRow&, - const history::VisitVector&) { + void SaveResultAndQuit(HistoryService::Handle, + bool success, + const history::URLRow*, + history::VisitVector*) { query_url_success_ = success; quit_closure_.Run(); } // For History requests. - base::CancelableTaskTracker tracker_; + CancelableRequestConsumer consumer_; bool query_url_success_; base::Closure quit_closure_; |