Index: chrome/browser/browsing_data_local_storage_helper_browsertest.cc |
diff --git a/chrome/browser/browsing_data_local_storage_helper_browsertest.cc b/chrome/browser/browsing_data_local_storage_helper_browsertest.cc |
index 66879735a52fe70439a64702be97dc603b92928b..c447012b476a8df4f9e70e35c2201dc6311e4a22 100644 |
--- a/chrome/browser/browsing_data_local_storage_helper_browsertest.cc |
+++ b/chrome/browser/browsing_data_local_storage_helper_browsertest.cc |
@@ -5,6 +5,7 @@ |
#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" |
@@ -23,7 +24,7 @@ |
namespace { |
typedef |
BrowsingDataHelperCallback<BrowsingDataLocalStorageHelper::LocalStorageInfo> |
- TestCompletionCallback; |
+ TestCompletionCallback; |
const FilePath::CharType kTestFile0[] = |
FILE_PATH_LITERAL("http_www.chromium.org_0.localstorage"); |
@@ -107,7 +108,8 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataLocalStorageHelperTest, CallbackCompletes) { |
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(); |
} |
@@ -153,7 +155,8 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataLocalStorageHelperTest, |
TestCompletionCallback callback; |
helper->StartFetching( |
- NewCallback(&callback, &TestCompletionCallback::callback)); |
+ base::Bind(&TestCompletionCallback::callback, |
+ base::Unretained(&callback))); |
std::list<BrowsingDataLocalStorageHelper::LocalStorageInfo> result = |
callback.result(); |
@@ -178,7 +181,8 @@ IN_PROC_BROWSER_TEST_F(BrowsingDataLocalStorageHelperTest, CannedUnique) { |
TestCompletionCallback callback; |
helper->StartFetching( |
- NewCallback(&callback, &TestCompletionCallback::callback)); |
+ base::Bind(&TestCompletionCallback::callback, |
+ base::Unretained(&callback))); |
std::list<BrowsingDataLocalStorageHelper::LocalStorageInfo> result = |
callback.result(); |