| Index: shell/domain_socket/unix_domain_server_socket_posix.cc
|
| diff --git a/mojo/shell/domain_socket/unix_domain_server_socket_posix.cc b/shell/domain_socket/unix_domain_server_socket_posix.cc
|
| similarity index 87%
|
| rename from mojo/shell/domain_socket/unix_domain_server_socket_posix.cc
|
| rename to shell/domain_socket/unix_domain_server_socket_posix.cc
|
| index 9f45070f331b11523109dcf137c93f8600b7eb48..778e41f31b7b7e4f788c2ca23bccf47d72151c16 100644
|
| --- a/mojo/shell/domain_socket/unix_domain_server_socket_posix.cc
|
| +++ b/shell/domain_socket/unix_domain_server_socket_posix.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "mojo/shell/domain_socket/unix_domain_server_socket_posix.h"
|
| +#include "shell/domain_socket/unix_domain_server_socket_posix.h"
|
|
|
| #include <errno.h>
|
| #include <sys/socket.h>
|
| @@ -10,11 +10,11 @@
|
| #include <unistd.h>
|
|
|
| #include "base/logging.h"
|
| -#include "mojo/shell/domain_socket/completion_callback.h"
|
| -#include "mojo/shell/domain_socket/net_errors.h"
|
| -#include "mojo/shell/domain_socket/socket_descriptor.h"
|
| -#include "mojo/shell/domain_socket/socket_libevent.h"
|
| -#include "mojo/shell/domain_socket/unix_domain_client_socket_posix.h"
|
| +#include "shell/domain_socket/completion_callback.h"
|
| +#include "shell/domain_socket/net_errors.h"
|
| +#include "shell/domain_socket/socket_descriptor.h"
|
| +#include "shell/domain_socket/socket_libevent.h"
|
| +#include "shell/domain_socket/unix_domain_client_socket_posix.h"
|
|
|
| namespace mojo {
|
| namespace shell {
|
| @@ -58,8 +58,8 @@ int UnixDomainServerSocket::ListenWithPath(const std::string& unix_domain_path,
|
| DCHECK(!listen_socket_);
|
|
|
| SockaddrStorage address;
|
| - if (!UnixDomainClientSocket::FillAddress(
|
| - unix_domain_path, use_abstract_namespace_, &address)) {
|
| + if (!UnixDomainClientSocket::FillAddress(unix_domain_path,
|
| + use_abstract_namespace_, &address)) {
|
| return net::ERR_ADDRESS_INVALID;
|
| }
|
|
|
| @@ -106,9 +106,7 @@ int UnixDomainServerSocket::DoAccept(const SetterCallback& setter_callback,
|
| int rv = listen_socket_->Accept(
|
| &accept_socket_,
|
| base::Bind(&UnixDomainServerSocket::AcceptCompleted,
|
| - base::Unretained(this),
|
| - setter_callback,
|
| - callback));
|
| + base::Unretained(this), setter_callback, callback));
|
| if (rv != net::OK)
|
| return rv;
|
| if (AuthenticateAndGetStreamSocket(setter_callback))
|
|
|