diff options
| author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-10 18:36:51 +0000 |
|---|---|---|
| committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-10 18:36:51 +0000 |
| commit | 1cb1a240b45493ae160fc8d822e332a5ce07d2e1 (patch) | |
| tree | dfce2084e834a081d2fce94625f541cda9a6bb52 /chrome/browser/visitedlink/visitedlink_master.h | |
| parent | 2da894c9f540654f4a169b1963974aadd187f260 (diff) | |
| download | chromium_src-1cb1a240b45493ae160fc8d822e332a5ce07d2e1.zip chromium_src-1cb1a240b45493ae160fc8d822e332a5ce07d2e1.tar.gz chromium_src-1cb1a240b45493ae160fc8d822e332a5ce07d2e1.tar.bz2 | |
Eliminated the last few uses of MessageLoop::QuitTask in chrome/
BUG=none
TEST=trybots
Review URL: http://codereview.chromium.org/8892023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113957 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/visitedlink/visitedlink_master.h')
| -rw-r--r-- | chrome/browser/visitedlink/visitedlink_master.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/visitedlink/visitedlink_master.h b/chrome/browser/visitedlink/visitedlink_master.h index 87de153..c84e809 100644 --- a/chrome/browser/visitedlink/visitedlink_master.h +++ b/chrome/browser/visitedlink/visitedlink_master.h @@ -12,6 +12,7 @@ #include <set> #include <vector> +#include "base/callback_forward.h" #include "base/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" @@ -102,9 +103,9 @@ class VisitedLinkMaster : public VisitedLinkCommon { // Sets a task to execute when the next rebuild from history is complete. // This is used by unit tests to wait for the rebuild to complete before // they continue. The pointer will be owned by this object after the call. - void set_rebuild_complete_task(Task* task) { - DCHECK(!rebuild_complete_task_.get()); - rebuild_complete_task_.reset(task); + void set_rebuild_complete_task(const base::Closure& task) { + DCHECK(rebuild_complete_task_.is_null()); + rebuild_complete_task_ = task; } // returns the number of items in the table for testing verification @@ -359,9 +360,9 @@ class VisitedLinkMaster : public VisitedLinkCommon { // BrowserProcess. This is provided for unit tests. HistoryService* history_service_override_; - // When non-NULL, indicates the task that should be run after the next - // rebuild from history is complete. - scoped_ptr<Task> rebuild_complete_task_; + // When set, indicates the task that should be run after the next rebuild from + // history is complete. + base::Closure rebuild_complete_task_; // Set to prevent us from attempting to rebuild the database from global // history if we have an error opening the file. This is used for testing, |