commit 2eb192e38a2b104c9923328ca63b9f6a9dd6aace
author jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Nov 04 09:14:16 2011 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 12:01:40 2020 +0900
tree b0916549e74ee96e083913302980a546ff329a5e
parent f19b24f092b572b75c44a8af5318297827b4856a

Android IPC changes.


BUG=
TEST=


Review URL: http://codereview.chromium.org/8437033

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108589 0039d316-1c4b-4281-b951-d872f2087c98


CrOS-Libchrome-Original-Commit: 6fa21d04082f0ec4416be6095d6cc12011cc4050

ipc/ipc_channel_posix_unittest.cc

diff --git a/ipc/ipc_channel_posix_unittest.cc b/ipc/ipc_channel_posix_unittest.cc
index 6f37ae6..61c21d3 100644
--- a/ipc/ipc_channel_posix_unittest.cc
+++ b/ipc/ipc_channel_posix_unittest.cc
@@ -107,8 +107,13 @@
   scoped_ptr<MessageLoopForIO> message_loop_;
 };
 
+#if defined(OS_ANDROID)
+const char IPCChannelPosixTest::kConnectionSocketTestName[] =
+    "/data/local/chrome_IPCChannelPosixTest__ConnectionSocket";
+#else
 const char IPCChannelPosixTest::kConnectionSocketTestName[] =
     "/var/tmp/chrome_IPCChannelPosixTest__ConnectionSocket";
+#endif
 
 void IPCChannelPosixTest::SetUp() {
   MultiProcessTest::SetUp();
@@ -177,8 +182,14 @@
 }
 
 TEST_F(IPCChannelPosixTest, BasicListen) {
+
+#if defined(OS_ANDROID)
+  const char* kChannelName = "/data/local/IPCChannelPosixTest_BasicListen";
+#else
+  const char* kChannelName = "/var/tmp/IPCChannelPosixTest_BasicListen";
+#endif
   // Test creating a socket that is listening.
-  IPC::ChannelHandle handle("/var/tmp/IPCChannelPosixTest_BasicListen");
+  IPC::ChannelHandle handle(kChannelName);
   SetUpSocket(&handle, IPC::Channel::MODE_NAMED_SERVER);
   unlink(handle.name.c_str());
   IPC::Channel channel(handle, IPC::Channel::MODE_NAMED_SERVER, NULL);
@@ -404,4 +415,3 @@
   }
   return 0;
 }
-