base::Bind fixes

chrome/browser/net/predictor.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/net/predictor.h"
 
 #include <algorithm>
 #include <cmath>
 #include <set>
 #include <sstream>
@@ skipping 682 matching lines @@
     const UrlList& startup_urls,
     base::ListValue* referral_list,
     IOThread* io_thread,
     bool predictor_enabled) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   predictor_enabled_ = predictor_enabled;
   initial_observer_.reset(new InitialObserver());
   host_resolver_ = io_thread->globals()->host_resolver.get();
 
   // ScopedRunnableMethodFactory instances need to be created and destroyed

[wtc, 2011/11/17 08:16:21]

This comment should not mention ScopedRunnableMethodFactory any
more.

   // on the same thread. The predictor lives on the IO thread and will die
   // from there so now that we're on the IO thread we need to properly
   // initialize the ScopedrunnableMethodFactory.
-  trim_task_factory_.reset(new ScopedRunnableMethodFactory<Predictor>(this));
+  // TODO(groby): Check if WeakPtrFactory has the same constraint.
+  weak_factory_.reset(new base::WeakPtrFactory<Predictor>(this));
 
   // Prefetch these hostnames on startup.
   DnsPrefetchMotivatedList(startup_urls, UrlInfo::STARTUP_LIST_MOTIVATED);
   DeserializeReferrersThenDelete(referral_list);
 }
 
 //-----------------------------------------------------------------------------
 // This section intermingles prefetch results with actual browser HTTP
 // network activity.  It supports calculating of the benefit of a prefetch, as
 // well as recording what prefetched hostname resolutions might be potentially
@@ skipping 332 matching lines @@
        it != referrers_.end(); ++it)
     urls_being_trimmed_.push_back(it->first);
   UMA_HISTOGRAM_COUNTS("Net.PredictionTrimSize", urls_being_trimmed_.size());
 }
 
 void Predictor::PostIncrementalTrimTask() {
   if (urls_being_trimmed_.empty())
     return;
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
-      trim_task_factory_->NewRunnableMethod(
-          &Predictor::IncrementalTrimReferrers, false),
+      base::Bind(&Predictor::IncrementalTrimReferrers,
+                 weak_factory_->GetWeakPtr(), false),
       kDurationBetweenTrimmingIncrements.InMilliseconds());
 }
 
 void Predictor::IncrementalTrimReferrers(bool trim_all_now) {
   size_t trim_count = urls_being_trimmed_.size();
   if (!trim_all_now)
     trim_count = std::min(trim_count, kUrlsTrimmedPerIncrement);
   while (trim_count-- != 0) {
     Referrers::iterator it = referrers_.find(urls_being_trimmed_.back());
     urls_being_trimmed_.pop_back();
@@ skipping 135 matching lines @@
                                            PrefService* local_state,
                                            IOThread* io_thread) {
   // Empty function for unittests.
 }
 
 void SimplePredictor::ShutdownOnUIThread(PrefService* user_prefs) {
   SetShutdown(true);
 }
 
 }  // namespace chrome_browser_net