| Index: content/browser/renderer_host/socket_stream_dispatcher_host.h
|
| ===================================================================
|
| --- content/browser/renderer_host/socket_stream_dispatcher_host.h (revision 222038)
|
| +++ content/browser/renderer_host/socket_stream_dispatcher_host.h (working copy)
|
| @@ -7,9 +7,9 @@
|
|
|
| #include <vector>
|
|
|
| +#include "base/callback_forward.h"
|
| #include "base/id_map.h"
|
| #include "base/memory/weak_ptr.h"
|
| -#include "content/browser/loader/resource_message_filter.h"
|
| #include "content/browser/ssl/ssl_error_handler.h"
|
| #include "content/public/browser/browser_message_filter.h"
|
| #include "net/socket_stream/socket_stream.h"
|
| @@ -32,9 +32,11 @@
|
| public net::SocketStream::Delegate,
|
| public SSLErrorHandler::Delegate {
|
| public:
|
| + typedef base::Callback<net::URLRequestContext*(ResourceType::Type)>
|
| + GetRequestContextCallback;
|
| SocketStreamDispatcherHost(
|
| int render_process_id,
|
| - ResourceMessageFilter::URLRequestContextSelector* selector,
|
| + const GetRequestContextCallback& request_context_callback,
|
| ResourceContext* resource_context);
|
|
|
| // BrowserMessageFilter:
|
| @@ -84,8 +86,7 @@
|
|
|
| IDMap<SocketStreamHost> hosts_;
|
| int render_process_id_;
|
| - const scoped_ptr<ResourceMessageFilter::URLRequestContextSelector>
|
| - url_request_context_selector_;
|
| + GetRequestContextCallback request_context_callback_;
|
| ResourceContext* resource_context_;
|
|
|
| base::WeakPtrFactory<SocketStreamDispatcherHost> weak_ptr_factory_;
|
|
|