Index: webkit/glue/alt_error_page_resource_fetcher.h |
diff --git a/webkit/glue/alt_error_page_resource_fetcher.h b/webkit/glue/alt_error_page_resource_fetcher.h |
index e2681b9d465646726058a6d5baadf0d0c74cdcd5..5987fe15bb2a111b287708cb345c8e6fcb353200 100644 |
--- a/webkit/glue/alt_error_page_resource_fetcher.h |
+++ b/webkit/glue/alt_error_page_resource_fetcher.h |
@@ -5,7 +5,7 @@ |
#ifndef WEBKIT_GLUE_ALT_ERROR_PAGE_RESOURCE_FETCHER_H_ |
#define WEBKIT_GLUE_ALT_ERROR_PAGE_RESOURCE_FETCHER_H_ |
-#include "base/callback_old.h" |
+#include "base/callback.h" |
#include "base/memory/scoped_ptr.h" |
#include "googleurl/src/gurl.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h" |
@@ -25,13 +25,13 @@ class AltErrorPageResourceFetcher { |
// This will be called when the alternative error page has been fetched, |
// successfully or not. If there is a failure, the third parameter (the |
// data) will be empty. |
- typedef Callback3<WebKit::WebFrame*, const WebKit::WebURLError&, |
- const std::string&>::Type Callback; |
+ typedef base::Callback<void(WebKit::WebFrame*, const WebKit::WebURLError&, |
+ const std::string&)> Callback; |
AltErrorPageResourceFetcher(const GURL& url, |
WebKit::WebFrame* frame, |
const WebKit::WebURLError& original_error, |
- Callback* callback); |
+ const Callback& callback); |
~AltErrorPageResourceFetcher(); |
// Stop any pending loads. |
@@ -45,7 +45,7 @@ class AltErrorPageResourceFetcher { |
scoped_ptr<ResourceFetcherWithTimeout> fetcher_; |
WebKit::WebFrame* frame_; |
- scoped_ptr<Callback> callback_; |
+ Callback callback_; |
// The error associated with this load. If there's an error talking with the |
// alt error page server, we need this to complete the original load. |