base::Bind: Convert BrowsingDatabaseHelper::StartFetching.

chrome/browser/browsing_data_database_helper_browsertest.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/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browsing_data_database_helper.h"
 #include "chrome/browser/browsing_data_helper_browsertest.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/browser_thread.h"
 
@@ skipping 57 matching lines @@
   BrowsingDataDatabaseHelper* database_helper_;
 };
 
 // Flaky on Win/Mac/Linux: http://crbug.com/92460
 IN_PROC_BROWSER_TEST_F(BrowsingDataDatabaseHelperTest, DISABLED_FetchData) {
   CreateDatabases();
   scoped_refptr<BrowsingDataDatabaseHelper> database_helper(
       new BrowsingDataDatabaseHelper(browser()->profile()));
   StopTestOnCallback stop_test_on_callback(database_helper);
   database_helper->StartFetching(
-      NewCallback(&stop_test_on_callback, &StopTestOnCallback::Callback));
+      base::Bind(&StopTestOnCallback::Callback,
+                 base::Unretained(&stop_test_on_callback)));
   // Blocks until StopTestOnCallback::Callback is notified.
   ui_test_utils::RunMessageLoop();
 }
 
 IN_PROC_BROWSER_TEST_F(BrowsingDataDatabaseHelperTest, CannedAddDatabase) {
   const GURL origin1("http://host1:1/");
   const GURL origin2("http://host2:1/");
   const char origin_str1[] = "http_host1_1";
   const char origin_str2[] = "http_host2_1";
   const char db1[] = "db1";
   const char db2[] = "db2";
   const char db3[] = "db3";
 
   scoped_refptr<CannedBrowsingDataDatabaseHelper> helper(
       new CannedBrowsingDataDatabaseHelper(browser()->profile()));
   helper->AddDatabase(origin1, db1, "");
   helper->AddDatabase(origin1, db2, "");
   helper->AddDatabase(origin2, db3, "");
 
   TestCompletionCallback callback;
   helper->StartFetching(
-      NewCallback(&callback, &TestCompletionCallback::callback));
+      base::Bind(&TestCompletionCallback::callback,
+                 base::Unretained(&callback)));
 
   std::list<BrowsingDataDatabaseHelper::DatabaseInfo> result =
       callback.result();
 
   ASSERT_EQ(3u, result.size());
   std::list<BrowsingDataDatabaseHelper::DatabaseInfo>::iterator info =
       result.begin();
   EXPECT_STREQ(origin_str1, info->origin_identifier.c_str());
   EXPECT_STREQ(db1, info->database_name.c_str());
   info++;
   EXPECT_STREQ(origin_str1, info->origin_identifier.c_str());
   EXPECT_STREQ(db2, info->database_name.c_str());
   info++;
   EXPECT_STREQ(origin_str2, info->origin_identifier.c_str());
   EXPECT_STREQ(db3, info->database_name.c_str());
 }
 
 IN_PROC_BROWSER_TEST_F(BrowsingDataDatabaseHelperTest, CannedUnique) {
   const GURL origin("http://host1:1/");
   const char origin_str[] = "http_host1_1";
   const char db[] = "db1";
 
   scoped_refptr<CannedBrowsingDataDatabaseHelper> helper(
       new CannedBrowsingDataDatabaseHelper(browser()->profile()));
   helper->AddDatabase(origin, db, "");
   helper->AddDatabase(origin, db, "");
 
   TestCompletionCallback callback;
   helper->StartFetching(
-      NewCallback(&callback, &TestCompletionCallback::callback));
+      base::Bind(&TestCompletionCallback::callback,
+                 base::Unretained(&callback)));
 
   std::list<BrowsingDataDatabaseHelper::DatabaseInfo> result =
       callback.result();
 
   ASSERT_EQ(1u, result.size());
   EXPECT_STREQ(origin_str, result.begin()->origin_identifier.c_str());
   EXPECT_STREQ(db, result.begin()->database_name.c_str());
 }
 }  // namespace