diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 23:45:35 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 23:45:35 +0000 |
| commit | 2f0158e718ff28a6884ffed00fc740a771e7929f (patch) | |
| tree | 94e900a0a0be8f5cb20cd76eabfe73dfc1634437 /chrome/browser/history/text_database_manager.cc | |
| parent | fdd84dc3a652c41a5f4e27a2363221c7a215f4f3 (diff) | |
| download | chromium_src-2f0158e718ff28a6884ffed00fc740a771e7929f.zip chromium_src-2f0158e718ff28a6884ffed00fc740a771e7929f.tar.gz chromium_src-2f0158e718ff28a6884ffed00fc740a771e7929f.tar.bz2 | |
Revert 104597 - base::Bind: Complete cleanup of history/.
Breaks Linux Touch.
BUG=none
TEST=none
R=csilv@chromium.org
Review URL: http://codereview.chromium.org/8163005
TBR=jhawkins@chromium.org
Review URL: http://codereview.chromium.org/8207012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104604 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/text_database_manager.cc')
| -rw-r--r-- | chrome/browser/history/text_database_manager.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/chrome/browser/history/text_database_manager.cc b/chrome/browser/history/text_database_manager.cc index 98e5990..09a79cf 100644 --- a/chrome/browser/history/text_database_manager.cc +++ b/chrome/browser/history/text_database_manager.cc @@ -4,7 +4,6 @@ #include "chrome/browser/history/text_database_manager.h" -#include "base/bind.h" #include "base/compiler_specific.h" #include "base/file_util.h" #include "base/metrics/histogram.h" @@ -86,7 +85,7 @@ TextDatabaseManager::TextDatabaseManager(const FilePath& dir, transaction_nesting_(0), db_cache_(DBCache::NO_AUTO_EVICT), present_databases_loaded_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + ALLOW_THIS_IN_INITIALIZER_LIST(factory_(this)), history_publisher_(NULL) { } @@ -533,11 +532,9 @@ TextDatabase* TextDatabaseManager::GetDBForTime(Time time, } void TextDatabaseManager::ScheduleFlushOldChanges() { - weak_factory_.InvalidateWeakPtrs(); - MessageLoop::current()->PostDelayedTask( - FROM_HERE, - base::Bind(&TextDatabaseManager::FlushOldChanges, - weak_factory_.GetWeakPtr()), + factory_.RevokeAll(); + MessageLoop::current()->PostDelayedTask(FROM_HERE, factory_.NewRunnableMethod( + &TextDatabaseManager::FlushOldChanges), kExpirationSec * Time::kMillisecondsPerSecond); } |