Fix platform unittests.

test/unittests/base/platform/platform-unittest.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/base/platform/platform.h"
 
 #if V8_OS_POSIX
 #include <unistd.h>  // NOLINT
 #endif
 
 #if V8_OS_WIN
 #include "src/base/win32-headers.h"
 #endif
 #include "testing/gtest/include/gtest/gtest.h"
 
+#if V8_OS_ANDROID
+#define DISABLE_ON_ANDROID(Name) DISABLED_##Name
+#else
+#define DISABLE_ON_ANDROID(Name) Name
+#endif
+
 namespace v8 {
 namespace base {
 
 TEST(OS, GetCurrentProcessId) {
 #if V8_OS_POSIX
   EXPECT_EQ(static_cast<int>(getpid()), OS::GetCurrentProcessId());
 #endif
 
 #if V8_OS_WIN
   EXPECT_EQ(static_cast<int>(::GetCurrentProcessId()),
             OS::GetCurrentProcessId());
 #endif
 }
 
 
 namespace {
 
 class SelfJoinThread FINAL : public Thread {
  public:
   SelfJoinThread() : Thread(Options("SelfJoinThread")) {}
-  virtual void Run() OVERRIDE { Join(); }
+  void Run() FINAL { Join(); }
 };
 
 }  // namespace
 
 
-TEST(Thread, SelfJoin) {
+TEST(Thread, DISABLE_ON_ANDROID(SelfJoin)) {
   SelfJoinThread thread;
   thread.Start();
   thread.Join();
 }
 
 
 namespace {
 
 class ThreadLocalStorageTest : public Thread, public ::testing::Test {
  public:
   ThreadLocalStorageTest() : Thread(Options("ThreadLocalStorageTest")) {
     for (size_t i = 0; i < arraysize(keys_); ++i) {
       keys_[i] = Thread::CreateThreadLocalKey();
     }
   }
   ~ThreadLocalStorageTest() {
     for (size_t i = 0; i < arraysize(keys_); ++i) {
       Thread::DeleteThreadLocalKey(keys_[i]);
     }
   }
 
-  virtual void Run() FINAL OVERRIDE {
+  void Run() FINAL {
     for (size_t i = 0; i < arraysize(keys_); i++) {
       CHECK(!Thread::HasThreadLocal(keys_[i]));
     }
     for (size_t i = 0; i < arraysize(keys_); i++) {
       Thread::SetThreadLocal(keys_[i], GetValue(i));
     }
     for (size_t i = 0; i < arraysize(keys_); i++) {
       CHECK(Thread::HasThreadLocal(keys_[i]));
     }
     for (size_t i = 0; i < arraysize(keys_); i++) {
       CHECK_EQ(GetValue(i), Thread::GetThreadLocal(keys_[i]));
       CHECK_EQ(GetValue(i), Thread::GetExistingThreadLocal(keys_[i]));
     }
     for (size_t i = 0; i < arraysize(keys_); i++) {
       Thread::SetThreadLocal(keys_[i], GetValue(arraysize(keys_) - i - 1));
     }
     for (size_t i = 0; i < arraysize(keys_); i++) {
       CHECK(Thread::HasThreadLocal(keys_[i]));
     }
     for (size_t i = 0; i < arraysize(keys_); i++) {
       CHECK_EQ(GetValue(arraysize(keys_) - i - 1),
                Thread::GetThreadLocal(keys_[i]));
       CHECK_EQ(GetValue(arraysize(keys_) - i - 1),
                Thread::GetExistingThreadLocal(keys_[i]));
     }
   }
 
  private:
   static void* GetValue(size_t x) {
-    return reinterpret_cast<void*>(static_cast<uintptr_t>(x + 1));
+    return bit_cast<void*>(static_cast<uintptr_t>(x + 1));
   }
 
-#if defined(ANDROID)
   // Older versions of Android have fewer TLS slots (nominally 64, but the
   // system uses "about 5 of them" itself).
   Thread::LocalStorageKey keys_[32];
-#else
-  Thread::LocalStorageKey keys_[256];
-#endif
 };
 
 }  // namespace
 
 
 TEST_F(ThreadLocalStorageTest, DoTest) {
   Run();
   Start();
   Join();
 }
 
 }  // namespace base
 }  // namespace v8