| Index: net/socket/unix_domain_socket_posix.cc
|
| diff --git a/net/socket/unix_domain_socket_posix.cc b/net/socket/unix_domain_socket_posix.cc
|
| index 3141f7166b22abb033b8278065ac0b4313e21c70..66ed13404df6ff0e73d1df401b6ab30e513e3551 100644
|
| --- a/net/socket/unix_domain_socket_posix.cc
|
| +++ b/net/socket/unix_domain_socket_posix.cc
|
| @@ -87,19 +87,18 @@ UnixDomainSocket::CreateAndListenWithAbstractNamespace(
|
| const std::string& fallback_path,
|
| StreamListenSocket::Delegate* del,
|
| const AuthCallback& auth_callback) {
|
| - return
|
| - CreateAndListenInternal(path, fallback_path, del, auth_callback, true);
|
| + return CreateAndListenInternal(path, fallback_path, del, auth_callback, true);
|
| }
|
| #endif
|
|
|
| -UnixDomainSocket::UnixDomainSocket(
|
| - SocketDescriptor s,
|
| - StreamListenSocket::Delegate* del,
|
| - const AuthCallback& auth_callback)
|
| - : StreamListenSocket(s, del),
|
| - auth_callback_(auth_callback) {}
|
| +UnixDomainSocket::UnixDomainSocket(SocketDescriptor s,
|
| + StreamListenSocket::Delegate* del,
|
| + const AuthCallback& auth_callback)
|
| + : StreamListenSocket(s, del), auth_callback_(auth_callback) {
|
| +}
|
|
|
| -UnixDomainSocket::~UnixDomainSocket() {}
|
| +UnixDomainSocket::~UnixDomainSocket() {
|
| +}
|
|
|
| // static
|
| SocketDescriptor UnixDomainSocket::CreateAndBind(const std::string& path,
|
| @@ -159,36 +158,39 @@ void UnixDomainSocket::Accept() {
|
| UnixDomainSocketFactory::UnixDomainSocketFactory(
|
| const std::string& path,
|
| const UnixDomainSocket::AuthCallback& auth_callback)
|
| - : path_(path),
|
| - auth_callback_(auth_callback) {}
|
| + : path_(path), auth_callback_(auth_callback) {
|
| +}
|
|
|
| -UnixDomainSocketFactory::~UnixDomainSocketFactory() {}
|
| +UnixDomainSocketFactory::~UnixDomainSocketFactory() {
|
| +}
|
|
|
| scoped_ptr<StreamListenSocket> UnixDomainSocketFactory::CreateAndListen(
|
| StreamListenSocket::Delegate* delegate) const {
|
| - return UnixDomainSocket::CreateAndListen(
|
| - path_, delegate, auth_callback_).PassAs<StreamListenSocket>();
|
| + return UnixDomainSocket::CreateAndListen(path_, delegate, auth_callback_)
|
| + .PassAs<StreamListenSocket>();
|
| }
|
|
|
| #if defined(SOCKET_ABSTRACT_NAMESPACE_SUPPORTED)
|
|
|
| UnixDomainSocketWithAbstractNamespaceFactory::
|
| -UnixDomainSocketWithAbstractNamespaceFactory(
|
| - const std::string& path,
|
| - const std::string& fallback_path,
|
| - const UnixDomainSocket::AuthCallback& auth_callback)
|
| + UnixDomainSocketWithAbstractNamespaceFactory(
|
| + const std::string& path,
|
| + const std::string& fallback_path,
|
| + const UnixDomainSocket::AuthCallback& auth_callback)
|
| : UnixDomainSocketFactory(path, auth_callback),
|
| - fallback_path_(fallback_path) {}
|
| + fallback_path_(fallback_path) {
|
| +}
|
|
|
| UnixDomainSocketWithAbstractNamespaceFactory::
|
| -~UnixDomainSocketWithAbstractNamespaceFactory() {}
|
| + ~UnixDomainSocketWithAbstractNamespaceFactory() {
|
| +}
|
|
|
| scoped_ptr<StreamListenSocket>
|
| UnixDomainSocketWithAbstractNamespaceFactory::CreateAndListen(
|
| StreamListenSocket::Delegate* delegate) const {
|
| return UnixDomainSocket::CreateAndListenWithAbstractNamespace(
|
| path_, fallback_path_, delegate, auth_callback_)
|
| - .PassAs<StreamListenSocket>();
|
| + .PassAs<StreamListenSocket>();
|
| }
|
|
|
| #endif
|
|
|