Cleanup Mutex and related classes.

test/cctest/test-platform-linux.cc

Index: test/cctest/test-platform-linux.cc
diff --git a/test/cctest/test-platform-linux.cc b/test/cctest/test-platform-linux.cc
index 6bb2902f41097825e0c5dc130dfd1628598cc295..7347aaceb464caf3001ff787993d14849587b2de 100644
--- a/test/cctest/test-platform-linux.cc
+++ b/test/cctest/test-platform-linux.cc
@@ -52,18 +52,16 @@ static void LoopIncrement(Mutex* mutex, int rem) {
     int count = 0;
     int last_count = -1;
     do {
-      CHECK_EQ(0, mutex->Lock());
+      LockGuard<Mutex> lock_guard(mutex);
       count = busy_lock_counter;
-      CHECK_EQ(0, mutex->Unlock());
       yield();
     } while (count % 2 == rem && count < kLockCounterLimit);
     if (count >= kLockCounterLimit) break;
-    CHECK_EQ(0, mutex->Lock());
+    LockGuard<Mutex> lock_guard(mutex);
     CHECK_EQ(count, busy_lock_counter);
     CHECK(last_count == -1 || count == last_count + 1);
     busy_lock_counter++;
     last_count = count;
-    CHECK_EQ(0, mutex->Unlock());
     yield();
   }
 }
@@ -79,15 +77,14 @@ static void* RunTestBusyLock(void* arg) {
 // increment a variable.
 TEST(BusyLock) {
   pthread_t other;
-  Mutex* mutex = OS::CreateMutex();
+  Mutex mutex;
   int thread_created = pthread_create(&other,
                                       NULL,
                                       &RunTestBusyLock,
-                                      mutex);
+                                      &mutex);
   CHECK_EQ(0, thread_created);
-  LoopIncrement(mutex, 1);
+  LoopIncrement(&mutex, 1);
   pthread_join(other, NULL);
-  delete mutex;
 }