| Index: shell/incoming_connection_listener_unittest.cc
|
| diff --git a/mojo/shell/incoming_connection_listener_unittest.cc b/shell/incoming_connection_listener_unittest.cc
|
| similarity index 88%
|
| rename from mojo/shell/incoming_connection_listener_unittest.cc
|
| rename to shell/incoming_connection_listener_unittest.cc
|
| index 3208fdd6dba26473f13eef7db5de920657187964..1c03889621445eab1fe8c00a66fb4f253dd791d9 100644
|
| --- a/mojo/shell/incoming_connection_listener_unittest.cc
|
| +++ b/shell/incoming_connection_listener_unittest.cc
|
| @@ -9,12 +9,12 @@
|
| #include "base/run_loop.h"
|
| #include "mojo/edk/embedder/channel_init.h"
|
| #include "mojo/edk/embedder/platform_channel_pair.h"
|
| -#include "mojo/shell/domain_socket/net_errors.h"
|
| -#include "mojo/shell/domain_socket/socket_descriptor.h"
|
| -#include "mojo/shell/domain_socket/test_completion_callback.h"
|
| -#include "mojo/shell/domain_socket/unix_domain_client_socket_posix.h"
|
| -#include "mojo/shell/external_application_registrar_connection.h"
|
| -#include "mojo/shell/incoming_connection_listener_posix.h"
|
| +#include "shell/domain_socket/net_errors.h"
|
| +#include "shell/domain_socket/socket_descriptor.h"
|
| +#include "shell/domain_socket/test_completion_callback.h"
|
| +#include "shell/domain_socket/unix_domain_client_socket_posix.h"
|
| +#include "shell/external_application_registrar_connection.h"
|
| +#include "shell/incoming_connection_listener_posix.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace mojo {
|
| @@ -125,10 +125,9 @@ TEST_F(IncomingConnectionListenerTest, ConnectFails_SocketFileUndeletable) {
|
| // later.
|
| int temp_dir_perms = 0;
|
| ASSERT_TRUE(base::GetPosixFilePermissions(temp_dir_.path(), &temp_dir_perms));
|
| - ASSERT_TRUE(
|
| - base::SetPosixFilePermissions(temp_dir_.path(),
|
| - base::FILE_PERMISSION_READ_BY_USER |
|
| - base::FILE_PERMISSION_WRITE_BY_USER));
|
| + ASSERT_TRUE(base::SetPosixFilePermissions(
|
| + temp_dir_.path(), base::FILE_PERMISSION_READ_BY_USER |
|
| + base::FILE_PERMISSION_WRITE_BY_USER));
|
| // The listener should fail to start up.
|
| listener.StartListening();
|
|
|
|
|