diff options
Diffstat (limited to 'ipc')
-rw-r--r-- | ipc/ipc_channel_posix.cc | 3 | ||||
-rw-r--r-- | ipc/mojo/ipc_channel_mojo.cc | 11 |
2 files changed, 5 insertions, 9 deletions
diff --git a/ipc/ipc_channel_posix.cc b/ipc/ipc_channel_posix.cc index 79a6acd..2dfd17e 100644 --- a/ipc/ipc_channel_posix.cc +++ b/ipc/ipc_channel_posix.cc @@ -1054,8 +1054,7 @@ base::ProcessId ChannelPosix::GetSelfPID() const { // static scoped_ptr<Channel> Channel::Create( const IPC::ChannelHandle &channel_handle, Mode mode, Listener* listener) { - return make_scoped_ptr(new ChannelPosix( - channel_handle, mode, listener)).PassAs<Channel>(); + return make_scoped_ptr(new ChannelPosix(channel_handle, mode, listener)); } // static diff --git a/ipc/mojo/ipc_channel_mojo.cc b/ipc/mojo/ipc_channel_mojo.cc index 791a970..e99e717 100644 --- a/ipc/mojo/ipc_channel_mojo.cc +++ b/ipc/mojo/ipc_channel_mojo.cc @@ -32,8 +32,7 @@ class MojoChannelFactory : public ChannelFactory { } virtual scoped_ptr<Channel> BuildChannel(Listener* listener) override { - return ChannelMojo::Create(delegate_, channel_handle_, mode_, listener) - .PassAs<Channel>(); + return ChannelMojo::Create(delegate_, channel_handle_, mode_, listener); } private: @@ -66,17 +65,15 @@ scoped_ptr<ChannelMojo> ChannelMojo::Create(ChannelMojo::Delegate* delegate, scoped_ptr<ChannelFactory> ChannelMojo::CreateServerFactory( ChannelMojo::Delegate* delegate, const ChannelHandle& channel_handle) { - return make_scoped_ptr(new MojoChannelFactory( - delegate, channel_handle, Channel::MODE_SERVER)) - .PassAs<ChannelFactory>(); + return make_scoped_ptr( + new MojoChannelFactory(delegate, channel_handle, Channel::MODE_SERVER)); } // static scoped_ptr<ChannelFactory> ChannelMojo::CreateClientFactory( const ChannelHandle& channel_handle) { return make_scoped_ptr( - new MojoChannelFactory(NULL, channel_handle, Channel::MODE_CLIENT)) - .PassAs<ChannelFactory>(); + new MojoChannelFactory(NULL, channel_handle, Channel::MODE_CLIENT)); } ChannelMojo::ChannelMojo(ChannelMojo::Delegate* delegate, |