base::Bind: Convert BrowsingDataLocalStorageHelper::StartFetching.

chrome/browser/browsing_data_local_storage_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 <string>
 
 #include "base/basictypes.h"
+#include "base/bind.h"

[csilv, 2011/10/26 17:40:56]

add bind_helpers.h

[James Hawkins, 2011/10/26 22:59:40]

Done.

 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/test/thread_test_helper.h"
 #include "chrome/browser/browsing_data_helper_browsertest.h"
 #include "chrome/browser/browsing_data_local_storage_helper.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/in_process_webkit/webkit_context.h"
 #include "content/browser/in_process_webkit/webkit_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 typedef
     BrowsingDataHelperCallback<BrowsingDataLocalStorageHelper::LocalStorageInfo>
-    TestCompletionCallback;
+        TestCompletionCallback;
 
 const FilePath::CharType kTestFile0[] =
     FILE_PATH_LITERAL("http_www.chromium.org_0.localstorage");
 
 const FilePath::CharType kTestFile1[] =
     FILE_PATH_LITERAL("http_www.google.com_0.localstorage");
 
 const FilePath::CharType kTestFileInvalid[] =
     FILE_PATH_LITERAL("http_www.google.com_localstorage_0.foo");
 
@@ skipping 63 matching lines @@
  private:
   BrowsingDataLocalStorageHelper* local_storage_helper_;
 };
 
 IN_PROC_BROWSER_TEST_F(BrowsingDataLocalStorageHelperTest, CallbackCompletes) {
   scoped_refptr<BrowsingDataLocalStorageHelper> local_storage_helper(
       new BrowsingDataLocalStorageHelper(browser()->profile()));
   CreateLocalStorageFilesForTest();
   StopTestOnCallback stop_test_on_callback(local_storage_helper);
   local_storage_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(BrowsingDataLocalStorageHelperTest, DeleteSingleFile) {
   scoped_refptr<BrowsingDataLocalStorageHelper> local_storage_helper(
       new BrowsingDataLocalStorageHelper(browser()->profile()));
   CreateLocalStorageFilesForTest();
   local_storage_helper->DeleteLocalStorageFile(
       GetLocalStoragePathForTestingProfile().Append(FilePath(kTestFile0)));
@@ skipping 25 matching lines @@
   const FilePath::CharType file2[] =
       FILE_PATH_LITERAL("http_host2_1.localstorage");
 
   scoped_refptr<CannedBrowsingDataLocalStorageHelper> helper(
       new CannedBrowsingDataLocalStorageHelper(browser()->profile()));
   helper->AddLocalStorage(origin1);
   helper->AddLocalStorage(origin2);
 
   TestCompletionCallback callback;
   helper->StartFetching(
-      NewCallback(&callback, &TestCompletionCallback::callback));
+      base::Bind(&TestCompletionCallback::callback,
+                 base::Unretained(&callback)));
 
   std::list<BrowsingDataLocalStorageHelper::LocalStorageInfo> result =
       callback.result();
 
   ASSERT_EQ(2u, result.size());
   std::list<BrowsingDataLocalStorageHelper::LocalStorageInfo>::iterator info =
       result.begin();
   EXPECT_EQ(FilePath(file1).value(), info->file_path.BaseName().value());
   info++;
   EXPECT_EQ(FilePath(file2).value(), info->file_path.BaseName().value());
 }
 
 IN_PROC_BROWSER_TEST_F(BrowsingDataLocalStorageHelperTest, CannedUnique) {
   const GURL origin("http://host1:1/");
   const FilePath::CharType file[] =
       FILE_PATH_LITERAL("http_host1_1.localstorage");
 
   scoped_refptr<CannedBrowsingDataLocalStorageHelper> helper(
       new CannedBrowsingDataLocalStorageHelper(browser()->profile()));
   helper->AddLocalStorage(origin);
   helper->AddLocalStorage(origin);
 
   TestCompletionCallback callback;
   helper->StartFetching(
-      NewCallback(&callback, &TestCompletionCallback::callback));
+      base::Bind(&TestCompletionCallback::callback,
+                 base::Unretained(&callback)));
 
   std::list<BrowsingDataLocalStorageHelper::LocalStorageInfo> result =
       callback.result();
 
   ASSERT_EQ(1u, result.size());
   EXPECT_EQ(FilePath(file).value(),
             result.begin()->file_path.BaseName().value());
 }
 }  // namespace