Android IPC changes.

ipc/ipc_channel_posix_unittest.cc

Index: ipc/ipc_channel_posix_unittest.cc
diff --git a/ipc/ipc_channel_posix_unittest.cc b/ipc/ipc_channel_posix_unittest.cc
index 6f37ae62bc55fe50b62033c65868c56d12e3beba..24d6c338e65fff9ec6af1397972a1b6b3945d4c6 100644
--- a/ipc/ipc_channel_posix_unittest.cc
+++ b/ipc/ipc_channel_posix_unittest.cc
@@ -107,8 +107,13 @@ private:
   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 @@ void IPCChannelPosixTest::SpinRunLoop(int milliseconds) {
 }
 
 TEST_F(IPCChannelPosixTest, BasicListen) {
+  static const char* kChannelName =

[dmac, 2011/11/02 20:29:58]

no need for static here is there?

Also above you put the decl in the #if block.. could we choose one form or
another for consistency?

+#if defined(OS_ANDROID)
+      "/data/local/IPCChannelPosixTest_BasicListen";
+#else
+      "/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);