X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fipc%2Fipc_send_fds_test.cc;h=cf2c68003de7ce723ea28b17c354ea8cea153911;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=1df6be98643f04580e18a8ff2265fd777eca6c2e;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/ipc/ipc_send_fds_test.cc b/src/ipc/ipc_send_fds_test.cc index 1df6be9..cf2c680 100644 --- a/src/ipc/ipc_send_fds_test.cc +++ b/src/ipc/ipc_send_fds_test.cc @@ -33,7 +33,7 @@ const char* kDevZeroPath = "/dev/zero"; class MyChannelDescriptorListenerBase : public IPC::Listener { public: - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { + bool OnMessageReceived(const IPC::Message& message) override { PickleIterator iter(message); base::FileDescriptor descriptor; @@ -60,12 +60,12 @@ class MyChannelDescriptorListener : public MyChannelDescriptorListenerBase { return num_fds_received_ == kNumFDsToSend; } - virtual void OnChannelError() OVERRIDE { + void OnChannelError() override { base::MessageLoop::current()->Quit(); } protected: - virtual void HandleFD(int fd) OVERRIDE { + void HandleFD(int fd) override { // Check that we can read from the FD. char buf; ssize_t amt_read = read(fd, &buf, 1); @@ -202,9 +202,7 @@ class MyCBListener : public MyChannelDescriptorListenerBase { } protected: - virtual void HandleFD(int fd) OVERRIDE { - cb_.Run(fd); - } + void HandleFD(int fd) override { cb_.Run(fd); } private: base::Callback cb_; }; @@ -234,9 +232,8 @@ class PipeChannelHelper { void Init() { IPC::ChannelHandle in_handle("IN"); in = IPC::Channel::CreateServer(in_handle, &null_listener_); - base::FileDescriptor out_fd( - in->TakeClientFileDescriptor(), false); - IPC::ChannelHandle out_handle("OUT", out_fd); + IPC::ChannelHandle out_handle( + "OUT", base::FileDescriptor(in->TakeClientFileDescriptor())); out = IPC::Channel::CreateClient(out_handle, &cb_listener_); // PostTask the connect calls to make sure the callbacks happens // on the right threads.