base::Bind fixes

chrome/browser/net/sqlite_origin_bound_cert_store_unittest.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 "base/bind.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
 #include "base/stl_util.h"
 #include "base/test/thread_test_helper.h"
 #include "chrome/browser/net/sqlite_origin_bound_cert_store.h"
 #include "chrome/common/chrome_constants.h"
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 108 matching lines @@
     std::string origin(1, c);
     std::string private_key(1000, c);
     std::string cert(1000, c);
     store_->AddOriginBoundCert(
         net::DefaultOriginBoundCertStore::OriginBoundCert(origin,
                                                           private_key,
                                                           cert));
   }
 
   // Call Flush() and wait until the DB thread is idle.
-  store_->Flush(NULL);
+  store_->Flush(base::Closure());
   scoped_refptr<base::ThreadTestHelper> helper(
       new base::ThreadTestHelper(
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB)));
   ASSERT_TRUE(helper->Run());
 
   // We forced a write, so now the file will be bigger.
   ASSERT_TRUE(file_util::GetFileInfo(path, &info));
   ASSERT_GT(info.size, base_size);
 }
 
@@ skipping 15 matching lines @@
   volatile int callback_count_;
 };
 
 // Test that we can get a completion callback after a Flush().
 TEST_F(SQLiteOriginBoundCertStoreTest, TestFlushCompletionCallback) {
   scoped_refptr<CallbackCounter> counter(new CallbackCounter());
 
   // Callback shouldn't be invoked until we call Flush().
   ASSERT_EQ(0, counter->callback_count());
 
-  store_->Flush(NewRunnableMethod(counter.get(), &CallbackCounter::Callback));
+  store_->Flush(base::Bind(&CallbackCounter::Callback, counter.get()));
 
   scoped_refptr<base::ThreadTestHelper> helper(
       new base::ThreadTestHelper(
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB)));
   ASSERT_TRUE(helper->Run());
 
   ASSERT_EQ(1, counter->callback_count());
 }