Android IPC changes.

ipc/ipc_channel_posix_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // These tests are POSIX only.
 
 #include "ipc/ipc_channel_posix.h"
 
 #include <fcntl.h>
 #include <sys/socket.h>
@@ skipping 89 matching lines @@
   static void SpinRunLoop(int milliseconds);
 
  protected:
   virtual void SetUp();
   virtual void TearDown();
 
 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();
   // Construct a fresh IO Message loop for the duration of each test.
   message_loop_.reset(new MessageLoopForIO());
 }
 
 void IPCChannelPosixTest::TearDown() {
   message_loop_.reset(NULL);
   MultiProcessTest::TearDown();
@@ skipping 48 matching lines @@
   MessageLoopForIO *loop = MessageLoopForIO::current();
   // Post a quit task so that this loop eventually ends and we don't hang
   // in the case of a bad test. Usually, the run loop will quit sooner than
   // that because all tests use a IPCChannelPosixTestListener which quits the
   // current run loop on any channel activity.
   loop->PostDelayedTask(FROM_HERE, new MessageLoop::QuitTask(), milliseconds);
   loop->Run();
 }
 
 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);
   ASSERT_TRUE(channel.Connect());
   ASSERT_TRUE(channel.AcceptsConnections());
   ASSERT_FALSE(channel.HasAcceptedConnection());
   channel.ResetToAcceptingConnectionState();
   ASSERT_FALSE(channel.HasAcceptedConnection());
 }
 
@@ skipping 205 matching lines @@
   // it.
   bool connected = channel.Connect();
   if (connected) {
     IPCChannelPosixTest::SpinRunLoop(TestTimeouts::action_max_timeout_ms());
     EXPECT_EQ(IPCChannelPosixTestListener::CHANNEL_ERROR, listener.status());
   } else {
     EXPECT_EQ(IPCChannelPosixTestListener::DISCONNECTED, listener.status());
   }
   return 0;
 }
-