2 files changed, 10 insertions, 10 deletions
diff --git a/sdk/android/native_unittests/audio_device/audio_device_unittest.cc b/sdk/android/native_unittests/audio_device/audio_device_unittest.cc
index 88dfad4a88..31da60cbc3 100644
--- a/sdk/android/native_unittests/audio_device/audio_device_unittest.cc
+++ b/sdk/android/native_unittests/audio_device/audio_device_unittest.cc
@@ -16,9 +16,9 @@
 #include "modules/audio_device/include/audio_device.h"
 #include "modules/audio_device/include/mock_audio_transport.h"
 #include "rtc_base/arraysize.h"
-#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
 #include "rtc_base/format_macros.h"
+#include "rtc_base/synchronization/mutex.h"
 #include "rtc_base/time_utils.h"
 #include "sdk/android/generated_native_unittests_jni/BuildInfo_jni.h"
 #include "sdk/android/native_api/audio_device_module/audio_device_android.h"
@@ -179,7 +179,7 @@ class FifoAudioStream : public AudioStreamInterface {
     }
     int16_t* memory = new int16_t[frames_per_buffer_];
     memcpy(static_cast<int16_t*>(&memory[0]), source, bytes_per_buffer_);
-    rtc::CritScope lock(&lock_);
+    MutexLock lock(&lock_);
     fifo_->push_back(memory);
     const size_t size = fifo_->size();
     if (size > largest_size_) {
@@ -195,7 +195,7 @@ class FifoAudioStream : public AudioStreamInterface {
   void Read(void* destination, size_t num_frames) override {
     ASSERT_EQ(num_frames, frames_per_buffer_);
     PRINTD("-");
-    rtc::CritScope lock(&lock_);
+    MutexLock lock(&lock_);
     if (fifo_->empty()) {
       memset(destination, 0, bytes_per_buffer_);
     } else {
@@ -226,7 +226,7 @@ class FifoAudioStream : public AudioStreamInterface {
   }
 
   using AudioBufferList = std::list<int16_t*>;
-  rtc::CriticalSection lock_;
+  Mutex lock_;
   const size_t frames_per_buffer_;
   const size_t bytes_per_buffer_;
   std::unique_ptr<AudioBufferList> fifo_;
diff --git a/sdk/android/native_unittests/stacktrace/stacktrace_unittest.cc b/sdk/android/native_unittests/stacktrace/stacktrace_unittest.cc
index e3b5e78cdd..fcd9c9b8f1 100644
--- a/sdk/android/native_unittests/stacktrace/stacktrace_unittest.cc
+++ b/sdk/android/native_unittests/stacktrace/stacktrace_unittest.cc
@@ -16,12 +16,12 @@
 #include <memory>
 #include <vector>
 
-#include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/platform_thread.h"
 #include "rtc_base/string_utils.h"
 #include "rtc_base/strings/string_builder.h"
+#include "rtc_base/synchronization/mutex.h"
 #include "rtc_base/system/inline.h"
 #include "system_wrappers/include/sleep.h"
 #include "test/gtest.h"
@@ -118,15 +118,15 @@ class RtcEventDeadlock : public DeadlockInterface {
 class RtcCriticalSectionDeadlock : public DeadlockInterface {
  public:
   RtcCriticalSectionDeadlock()
-      : critscope_(std::make_unique<rtc::CritScope>(&crit_)) {}
+      : mutex_lock_(std::make_unique<MutexLock>(&mutex_)) {}
 
  private:
-  void Deadlock() override { rtc::CritScope lock(&crit_); }
+  void Deadlock() override { MutexLock lock(&mutex_); }
 
-  void Release() override { critscope_.reset(); }
+  void Release() override { mutex_lock_.reset(); }
 
-  rtc::CriticalSection crit_;
-  std::unique_ptr<rtc::CritScope> critscope_;
+  Mutex mutex_;
+  std::unique_ptr<MutexLock> mutex_lock_;
 };
 
 class SpinDeadlock : public DeadlockInterface {