| Index: net/socket/unix_domain_socket_posix_unittest.cc
|
| diff --git a/net/socket/unix_domain_socket_posix_unittest.cc b/net/socket/unix_domain_socket_posix_unittest.cc
|
| index b1857e62e0e19df8f1d226def89fc954d4f8f951..7da43a533b5f9e013f7dd421a21c1696cf48cddc 100644
|
| --- a/net/socket/unix_domain_socket_posix_unittest.cc
|
| +++ b/net/socket/unix_domain_socket_posix_unittest.cc
|
| @@ -123,9 +123,7 @@ class TestListenSocketDelegate : public StreamListenSocket::Delegate {
|
| Notify(EVENT_CLOSE);
|
| }
|
|
|
| - void OnListenCompleted() {
|
| - Notify(EVENT_LISTEN);
|
| - }
|
| + void OnListenCompleted() { Notify(EVENT_LISTEN); }
|
|
|
| string ReceivedData() {
|
| base::AutoLock lock(mutex_);
|
| @@ -133,9 +131,7 @@ class TestListenSocketDelegate : public StreamListenSocket::Delegate {
|
| }
|
|
|
| private:
|
| - void Notify(EventType event) {
|
| - event_manager_->Notify(event);
|
| - }
|
| + void Notify(EventType event) { event_manager_->Notify(event); }
|
|
|
| const scoped_refptr<EventManager> event_manager_;
|
| scoped_ptr<StreamListenSocket> connection_;
|
| @@ -143,11 +139,11 @@ class TestListenSocketDelegate : public StreamListenSocket::Delegate {
|
| string data_;
|
| };
|
|
|
| -bool UserCanConnectCallback(
|
| - bool allow_user, const scoped_refptr<EventManager>& event_manager,
|
| - uid_t, gid_t) {
|
| - event_manager->Notify(
|
| - allow_user ? EVENT_AUTH_GRANTED : EVENT_AUTH_DENIED);
|
| +bool UserCanConnectCallback(bool allow_user,
|
| + const scoped_refptr<EventManager>& event_manager,
|
| + uid_t,
|
| + gid_t) {
|
| + event_manager->Notify(allow_user ? EVENT_AUTH_GRANTED : EVENT_AUTH_DENIED);
|
| return allow_user;
|
| }
|
|
|
| @@ -161,8 +157,7 @@ class UnixDomainSocketTestHelper : public testing::Test {
|
|
|
| protected:
|
| UnixDomainSocketTestHelper(const string& path, bool allow_user)
|
| - : file_path_(path),
|
| - allow_user_(allow_user) {}
|
| + : file_path_(path), allow_user_(allow_user) {}
|
|
|
| virtual void SetUp() OVERRIDE {
|
| event_manager_ = new EventManager();
|
| @@ -269,9 +264,8 @@ TEST_F(UnixDomainSocketTest, TestFallbackName) {
|
| file_path_.value(), "", socket_delegate_.get(), MakeAuthCallback());
|
| EXPECT_FALSE(existing_socket.get() == NULL);
|
| // First, try to bind socket with the same name with no fallback name.
|
| - socket_ =
|
| - UnixDomainSocket::CreateAndListenWithAbstractNamespace(
|
| - file_path_.value(), "", socket_delegate_.get(), MakeAuthCallback());
|
| + socket_ = UnixDomainSocket::CreateAndListenWithAbstractNamespace(
|
| + file_path_.value(), "", socket_delegate_.get(), MakeAuthCallback());
|
| EXPECT_TRUE(socket_.get() == NULL);
|
| // Now with a fallback name.
|
| const char kFallbackSocketName[] = "unix_domain_socket_for_testing_2";
|
|
|