diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-06-03 10:58:34 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-06-03 10:58:34 +0100 |
| commit | cedac228d2dd51db4b79ea1e72c7f249408ee061 (patch) | |
| tree | aa4ff43d7fe316e95d12721ce5e17653a768a0dd /cloud_print | |
| parent | 6a869ecff032b5bed299d661b078b0555034598b (diff) | |
| download | chromium_org-cedac228d2dd51db4b79ea1e72c7f249408ee061.tar.gz | |
Merge from Chromium at DEPS revision 273901
This commit was generated by merge_to_master.py.
Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
Diffstat (limited to 'cloud_print')
| -rw-r--r-- | cloud_print/service/win/service_listener.cc | 4 | ||||
| -rw-r--r-- | cloud_print/service/win/setup_listener.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cloud_print/service/win/service_listener.cc b/cloud_print/service/win/service_listener.cc index 53622a8b2b..bdb221743b 100644 --- a/cloud_print/service/win/service_listener.cc +++ b/cloud_print/service/win/service_listener.cc @@ -91,8 +91,8 @@ void ServiceListener::Connect() { SECURITY_SQOS_PRESENT | SECURITY_IDENTIFICATION | FILE_FLAG_OVERLAPPED, NULL)); if (handle.IsValid()) { - channel_.reset(new IPC::Channel(IPC::ChannelHandle(handle), - IPC::Channel::MODE_CLIENT, this)); + channel_ = IPC::Channel::CreateClient(IPC::ChannelHandle(handle), + this); channel_->Connect(); } else { ipc_thread_->message_loop()->PostDelayedTask( diff --git a/cloud_print/service/win/setup_listener.cc b/cloud_print/service/win/setup_listener.cc index dd1cb375d2..c0b6d1b9b3 100644 --- a/cloud_print/service/win/setup_listener.cc +++ b/cloud_print/service/win/setup_listener.cc @@ -117,8 +117,8 @@ void SetupListener::Connect(const base::string16& user) { IPC::Channel::kReadBufferSize, IPC::Channel::kReadBufferSize, 5000, &attribs)); if (pipe.IsValid()) { - channel_.reset(new IPC::Channel(IPC::ChannelHandle(pipe), - IPC::Channel::MODE_SERVER, this)); + channel_ = IPC::Channel::CreateServer(IPC::ChannelHandle(pipe), + this); channel_->Connect(); } } |