base::Bind fixes

chrome/browser/net/sqlite_origin_bound_cert_store.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/sqlite_origin_bound_cert_store.h"
 
 #include <list>
 
 #include "base/basictypes.h"
+#include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/diagnostics/sqlite_diagnostics.h"
 #include "content/public/browser/browser_thread.h"
 #include "sql/meta_table.h"
@@ skipping 20 matching lines @@
 
   // Batch an origin bound cert addition.
   void AddOriginBoundCert(
       const net::DefaultOriginBoundCertStore::OriginBoundCert& cert);
 
   // Batch an origin bound cert deletion.
   void DeleteOriginBoundCert(
       const net::DefaultOriginBoundCertStore::OriginBoundCert& cert);
 
   // Commit pending operations as soon as possible.
-  void Flush(Task* completion_task);
+  void Flush(const base::Closure& completion_task);
 
   // Commit any pending operations and close the database.  This must be called
   // before the object is destructed.
   void Close();
 
   void SetClearLocalStateOnExit(bool clear_local_state);
 
  private:
   friend class base::RefCountedThreadSafe<SQLiteOriginBoundCertStore::Backend>;
 
@@ skipping 254 matching lines @@
         break;
 
       default:
         NOTREACHED();
         break;
     }
   }
   transaction.Commit();
 }
 
-void SQLiteOriginBoundCertStore::Backend::Flush(Task* completion_task) {
+void SQLiteOriginBoundCertStore::Backend::Flush(
+    const base::Closure& completion_task) {
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::DB));
   BrowserThread::PostTask(
-      BrowserThread::DB, FROM_HERE, NewRunnableMethod(this, &Backend::Commit));
-  if (completion_task) {
+      BrowserThread::DB, FROM_HERE, base::Bind(&Backend::Commit, this));
+  if (!completion_task.is_null()) {
     // We want the completion task to run immediately after Commit() returns.
     // Posting it from here means there is less chance of another task getting
     // onto the message queue first, than if we posted it from Commit() itself.
     BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, completion_task);
   }
 }
 
 // Fire off a close message to the background thread. We could still have a
 // pending commit timer that will be holding a reference on us, but if/when
 // this fires we will already have been cleaned up and it will be ignored.
@@ skipping 51 matching lines @@
   if (backend_.get())
     backend_->DeleteOriginBoundCert(cert);
 }
 
 void SQLiteOriginBoundCertStore::SetClearLocalStateOnExit(
     bool clear_local_state) {
   if (backend_.get())
     backend_->SetClearLocalStateOnExit(clear_local_state);
 }
 
-void SQLiteOriginBoundCertStore::Flush(Task* completion_task) {
+void SQLiteOriginBoundCertStore::Flush(const base::Closure& completion_task) {
   if (backend_.get())
     backend_->Flush(completion_task);
-  else if (completion_task)
+  else if (!completion_task.is_null())
     MessageLoop::current()->PostTask(FROM_HERE, completion_task);
 }