| Index: webkit/plugins/ppapi/ppb_transport_impl.h
|
| diff --git a/webkit/plugins/ppapi/ppb_transport_impl.h b/webkit/plugins/ppapi/ppb_transport_impl.h
|
| index 1e5ecfade17929a770181e4aaa4de6dea084cfbd..34393e4297976964b6c2bd743f7381325a2167c8 100644
|
| --- a/webkit/plugins/ppapi/ppb_transport_impl.h
|
| +++ b/webkit/plugins/ppapi/ppb_transport_impl.h
|
| @@ -11,10 +11,10 @@
|
| #include "base/basictypes.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "net/base/completion_callback.h"
|
| +#include "ppapi/shared_impl/tracked_callback.h"
|
| #include "ppapi/shared_impl/resource.h"
|
| #include "ppapi/thunk/ppb_transport_api.h"
|
| #include "webkit/glue/p2p_transport.h"
|
| -#include "webkit/plugins/ppapi/callbacks.h"
|
|
|
| namespace webkit {
|
| namespace ppapi {
|
| @@ -67,11 +67,11 @@ class PPB_Transport_Impl : public ::ppapi::Resource,
|
| bool writable_;
|
| std::list<std::string> local_candidates_;
|
|
|
| - scoped_refptr<TrackedCompletionCallback> connect_callback_;
|
| - scoped_refptr<TrackedCompletionCallback> next_address_callback_;
|
| + scoped_refptr< ::ppapi::TrackedCallback> connect_callback_;
|
| + scoped_refptr< ::ppapi::TrackedCallback> next_address_callback_;
|
|
|
| - scoped_refptr<TrackedCompletionCallback> recv_callback_;
|
| - scoped_refptr<TrackedCompletionCallback> send_callback_;
|
| + scoped_refptr< ::ppapi::TrackedCallback> recv_callback_;
|
| + scoped_refptr< ::ppapi::TrackedCallback> send_callback_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(PPB_Transport_Impl);
|
| };
|
|
|