| Index: mojo/edk/system/transport_data.h
|
| diff --git a/third_party/mojo/src/mojo/edk/system/transport_data.h b/mojo/edk/system/transport_data.h
|
| similarity index 97%
|
| copy from third_party/mojo/src/mojo/edk/system/transport_data.h
|
| copy to mojo/edk/system/transport_data.h
|
| index 20bb80fe3c37164a3a103273ddd203b3fbd9396b..d8ecb11d59f997c01a9cf894ef3e4cc4c5801074 100644
|
| --- a/third_party/mojo/src/mojo/edk/system/transport_data.h
|
| +++ b/mojo/edk/system/transport_data.h
|
| @@ -21,8 +21,6 @@
|
| namespace mojo {
|
| namespace system {
|
|
|
| -class Channel;
|
| -
|
| // This class is used by |MessageInTransit| to represent handles (|Dispatcher|s)
|
| // in various stages of serialization.
|
| //
|
| @@ -89,7 +87,7 @@ class MOJO_SYSTEM_IMPL_EXPORT TransportData {
|
| // The maximum total number of platform handles that may be attached.
|
| static size_t GetMaxPlatformHandles();
|
|
|
| - TransportData(scoped_ptr<DispatcherVector> dispatchers, Channel* channel);
|
| + explicit TransportData(scoped_ptr<DispatcherVector> dispatchers);
|
|
|
| // This is used for users of |MessageInTransit|/|TransportData|/|RawChannel|
|
| // that want to simply transport data and platform handles, and not
|
| @@ -143,8 +141,7 @@ class MOJO_SYSTEM_IMPL_EXPORT TransportData {
|
| static scoped_ptr<DispatcherVector> DeserializeDispatchers(
|
| const void* buffer,
|
| size_t buffer_size,
|
| - embedder::ScopedPlatformHandleVectorPtr platform_handles,
|
| - Channel* channel);
|
| + embedder::ScopedPlatformHandleVectorPtr platform_handles);
|
|
|
| private:
|
| // To allow us to make compile-assertions about |Header|, etc. in the .cc
|
|
|