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

1 files changed, 5 insertions, 10 deletions

diff --git a/chrome/browser/history/expire_history_backend.cc b/chrome/browser/history/expire_history_backend.cc
index 0149646..0542ab8 100644
--- a/chrome/browser/history/expire_history_backend.cc
+++ b/chrome/browser/history/expire_history_backend.cc
@@ -7,7 +7,6 @@
 #include <algorithm>
 #include <limits>
 
-#include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
@@ -169,7 +168,7 @@ ExpireHistoryBackend::ExpireHistoryBackend(
       archived_db_(NULL),
       thumb_db_(NULL),
       text_db_(NULL),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+      ALLOW_THIS_IN_INITIALIZER_LIST(factory_(this)),
       bookmark_service_(bookmark_service) {
 }
 
@@ -574,11 +573,8 @@ void ExpireHistoryBackend::ScheduleArchive() {
     delay = TimeDelta::FromSeconds(kExpirationDelaySec);
   }
 
-  MessageLoop::current()->PostDelayedTask(
-      FROM_HERE,
-      base::Bind(&ExpireHistoryBackend::DoArchiveIteration,
-                 weak_factory_.GetWeakPtr()),
-      delay.InMilliseconds());
+  MessageLoop::current()->PostDelayedTask(FROM_HERE, factory_.NewRunnableMethod(
+          &ExpireHistoryBackend::DoArchiveIteration), delay.InMilliseconds());
 }
 
 void ExpireHistoryBackend::DoArchiveIteration() {
@@ -670,9 +666,8 @@ void ExpireHistoryBackend::ScheduleExpireHistoryIndexFiles() {
 
   TimeDelta delay = TimeDelta::FromMinutes(kIndexExpirationDelayMin);
   MessageLoop::current()->PostDelayedTask(
-      FROM_HERE,
-      base::Bind(&ExpireHistoryBackend::DoExpireHistoryIndexFiles,
-                 weak_factory_.GetWeakPtr()),
+      FROM_HERE, factory_.NewRunnableMethod(
+          &ExpireHistoryBackend::DoExpireHistoryIndexFiles),
       delay.InMilliseconds());
 }