| Index: content/browser/renderer_host/pepper_message_filter.cc
|
| diff --git a/content/browser/renderer_host/pepper_message_filter.cc b/content/browser/renderer_host/pepper_message_filter.cc
|
| index 43880d7c26bcf42e3b0d0d6f59d4887ca182fa07..adddf5f600f496d47f8bc386c6d142b72ec45cb0 100644
|
| --- a/content/browser/renderer_host/pepper_message_filter.cc
|
| +++ b/content/browser/renderer_host/pepper_message_filter.cc
|
| @@ -11,6 +11,7 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "base/bind.h"
|
| +#include "base/bind_helpers.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/logging.h"
|
| #include "base/memory/linked_ptr.h"
|
| @@ -180,7 +181,6 @@ class PepperMessageFilter::FlashTCPSocket {
|
| ConnectionState connection_state_;
|
| bool end_of_file_reached_;
|
|
|
| - net::OldCompletionCallbackImpl<FlashTCPSocket> resolve_callback_;
|
| net::OldCompletionCallbackImpl<FlashTCPSocket> connect_callback_;
|
| net::OldCompletionCallbackImpl<FlashTCPSocket> ssl_handshake_callback_;
|
| net::OldCompletionCallbackImpl<FlashTCPSocket> read_callback_;
|
| @@ -304,8 +304,6 @@ PepperMessageFilter::FlashTCPSocket::FlashTCPSocket(
|
| connection_state_(BEFORE_CONNECT),
|
| end_of_file_reached_(false),
|
| ALLOW_THIS_IN_INITIALIZER_LIST(
|
| - resolve_callback_(this, &FlashTCPSocket::OnResolveCompleted)),
|
| - ALLOW_THIS_IN_INITIALIZER_LIST(
|
| connect_callback_(this, &FlashTCPSocket::OnConnectCompleted)),
|
| ALLOW_THIS_IN_INITIALIZER_LIST(
|
| ssl_handshake_callback_(this,
|
| @@ -336,8 +334,10 @@ void PepperMessageFilter::FlashTCPSocket::Connect(const std::string& host,
|
| net::HostResolver::RequestInfo request_info(net::HostPortPair(host, port));
|
| resolver_.reset(new net::SingleRequestHostResolver(
|
| manager_->GetHostResolver()));
|
| - int result = resolver_->Resolve(request_info, &address_list_,
|
| - &resolve_callback_, net::BoundNetLog());
|
| + int result = resolver_->Resolve(
|
| + request_info, &address_list_,
|
| + base::Bind(&FlashTCPSocket::OnResolveCompleted, base::Unretained(this)),
|
| + net::BoundNetLog());
|
| if (result != net::ERR_IO_PENDING)
|
| OnResolveCompleted(result);
|
| }
|
|
|