[Android] Use a "unique" remote debugging socket name on bind failure

net/socket/unix_domain_socket_posix_unittest.cc

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 ed0b01891833090031f3ee7fcc827cd71df335ea..6ee1154d836e9001d56877a6b072b9e317afb0fa 100644
--- a/net/socket/unix_domain_socket_posix_unittest.cc
+++ b/net/socket/unix_domain_socket_posix_unittest.cc
@@ -39,6 +39,7 @@ namespace net {
 namespace {
 
 const char kSocketFilename[] = "unix_domain_socket_for_testing";
+const char kFallbackSocketName[] = "unix_domain_socket_for_testing_2";
 const char kInvalidSocketPath[] = "/invalid/path";
 const char kMsg[] = "hello";
 
@@ -254,9 +255,29 @@ TEST_F(UnixDomainSocketTestWithInvalidPath, CreateAndListenWithInvalidPath) {
 TEST_F(UnixDomainSocketTestWithInvalidPath,
        CreateAndListenWithAbstractNamespace) {
   socket_ = UnixDomainSocket::CreateAndListenWithAbstractNamespace(
-      file_path_.value(), socket_delegate_.get(), MakeAuthCallback());
+      file_path_.value(), "", socket_delegate_.get(), MakeAuthCallback());
   EXPECT_FALSE(socket_.get() == NULL);
 }
+
+TEST_F(UnixDomainSocketTest, TestFallbackName) {
+  scoped_refptr<UnixDomainSocket> existing_socket =
+      UnixDomainSocket::CreateAndListenWithAbstractNamespace(
+          kSocketFilename, "", socket_delegate_.get(), MakeAuthCallback());

[szym, 2013/05/29 18:49:04]

Do not use kSocketFilename alone. Use MakeSocketPath() which appends
kSocketFilename to a temporary directory. Maybe extend MakeSocketPath to take a
suffix argument.

[mnaganov (inactive), 2013/05/29 20:11:11]

But that's for abstract namespace names only. Is full socket path also required
in this case?

[szym, 2013/05/29 20:13:53]

The concern is interference with other tests running in parallel. Each test
instance should use a unique name.

[mnaganov (inactive), 2013/05/29 20:37:11]

Makes sense. Fixed!

+  EXPECT_FALSE(existing_socket.get() == NULL);
+  // First, try to bind socket with the same name with no fallback name.
+  socket_ =
+      UnixDomainSocket::CreateAndListenWithAbstractNamespace(
+          kSocketFilename, "", socket_delegate_.get(), MakeAuthCallback());
+  EXPECT_TRUE(socket_.get() == NULL);
+  // Now with a fallback name.
+  socket_ = UnixDomainSocket::CreateAndListenWithAbstractNamespace(
+      kSocketFilename,
+      kFallbackSocketName,
+      socket_delegate_.get(),
+      MakeAuthCallback());
+  EXPECT_FALSE(socket_.get() == NULL);
+  existing_socket = NULL;
+}
 #endif
 
 TEST_F(UnixDomainSocketTest, TestWithClient) {