diff --git a/lib/sanitizer_common/tests/CMakeLists.txt b/lib/sanitizer_common/tests/CMakeLists.txt
index fd29d17..fd31b6d 100644
--- a/lib/sanitizer_common/tests/CMakeLists.txt
+++ b/lib/sanitizer_common/tests/CMakeLists.txt
@@ -9,40 +9,42 @@
 endif()
 
 set(SANITIZER_UNITTESTS
-  sanitizer_allocator_test.cc
-  sanitizer_atomic_test.cc
-  sanitizer_bitvector_test.cc
-  sanitizer_bvgraph_test.cc
-  sanitizer_common_test.cc
-  sanitizer_deadlock_detector_test.cc
-  sanitizer_flags_test.cc
-  sanitizer_format_interceptor_test.cc
-  sanitizer_ioctl_test.cc
-  sanitizer_libc_test.cc
-  sanitizer_linux_test.cc
-  sanitizer_list_test.cc
-  sanitizer_mutex_test.cc
-  sanitizer_nolibc_test.cc
-  sanitizer_posix_test.cc
-  sanitizer_printf_test.cc
-  sanitizer_procmaps_test.cc
-  sanitizer_ring_buffer_test.cc
-  sanitizer_quarantine_test.cc
-  sanitizer_stackdepot_test.cc
-  sanitizer_stacktrace_printer_test.cc
-  sanitizer_stacktrace_test.cc
-  sanitizer_stoptheworld_test.cc
-  sanitizer_suppressions_test.cc
-  sanitizer_symbolizer_test.cc
-  sanitizer_test_main.cc
-  sanitizer_thread_registry_test.cc
-  sanitizer_type_traits_test.cc
-  sanitizer_vector_test.cc)
+  sanitizer_allocator_test.cpp
+  sanitizer_atomic_test.cpp
+  sanitizer_bitvector_test.cpp
+  sanitizer_bvgraph_test.cpp
+  sanitizer_common_test.cpp
+  sanitizer_deadlock_detector_test.cpp
+  sanitizer_flags_test.cpp
+  sanitizer_format_interceptor_test.cpp
+  sanitizer_ioctl_test.cpp
+  sanitizer_libc_test.cpp
+  sanitizer_linux_test.cpp
+  sanitizer_list_test.cpp
+  sanitizer_mutex_test.cpp
+  sanitizer_nolibc_test.cpp
+  sanitizer_posix_test.cpp
+  sanitizer_printf_test.cpp
+  sanitizer_procmaps_test.cpp
+  sanitizer_ring_buffer_test.cpp
+  sanitizer_quarantine_test.cpp
+  sanitizer_stackdepot_test.cpp
+  sanitizer_stacktrace_printer_test.cpp
+  sanitizer_stacktrace_test.cpp
+  sanitizer_stoptheworld_test.cpp
+  sanitizer_suppressions_test.cpp
+  sanitizer_symbolizer_test.cpp
+  sanitizer_test_main.cpp
+  sanitizer_thread_registry_test.cpp
+  sanitizer_type_traits_test.cpp
+  sanitizer_vector_test.cpp
+  )
 
 set(SANITIZER_TEST_HEADERS
   sanitizer_pthread_wrappers.h
   sanitizer_test_config.h
-  sanitizer_test_utils.h)
+  sanitizer_test_utils.h
+  )
 foreach(header ${SANITIZER_IMPL_HEADERS})
   list(APPEND SANITIZER_TEST_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../${header})
 endforeach()
@@ -57,7 +59,8 @@
   -O2
   -Werror=sign-compare
   -Wno-non-virtual-dtor
-  -Wno-gnu-zero-variadic-macro-arguments)
+  -Wno-gnu-zero-variadic-macro-arguments
+  )
 
 set(SANITIZER_TEST_LINK_FLAGS_COMMON ${COMPILER_RT_UNITTEST_LINK_FLAGS})
 
@@ -156,9 +159,9 @@
   if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" AND "${arch}" STREQUAL "x86_64")
     # Test that the libc-independent part of sanitizer_common is indeed
     # independent of libc, by linking this binary without libc (here) and
-    # executing it (unit test in sanitizer_nolibc_test.cc).
+    # executing it (unit test in sanitizer_nolibc_test.cpp).
     clang_compile(sanitizer_nolibc_test_main.${arch}.o
-                  sanitizer_nolibc_test_main.cc
+                  sanitizer_nolibc_test_main.cpp
                   CFLAGS ${SANITIZER_TEST_CFLAGS_COMMON} ${TARGET_FLAGS}
                   DEPS ${SANITIZER_TEST_COMPILE_DEPS})
     add_compiler_rt_test(SanitizerUnitTests "Sanitizer-${arch}-Test-Nolibc" ${arch}
diff --git a/lib/sanitizer_common/tests/malloc_stress_transfer_test.cc b/lib/sanitizer_common/tests/malloc_stress_transfer_test.cpp
similarity index 100%
rename from lib/sanitizer_common/tests/malloc_stress_transfer_test.cc
rename to lib/sanitizer_common/tests/malloc_stress_transfer_test.cpp
diff --git a/lib/sanitizer_common/tests/sanitizer_allocator_test.cc b/lib/sanitizer_common/tests/sanitizer_allocator_test.cpp
similarity index 99%
rename from lib/sanitizer_common/tests/sanitizer_allocator_test.cc
rename to lib/sanitizer_common/tests/sanitizer_allocator_test.cpp
index 5d99bf4..1015a60 100644
--- a/lib/sanitizer_common/tests/sanitizer_allocator_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_allocator_test.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_allocator_test.cc ---------------------------------------===//
+//===-- sanitizer_allocator_test.cpp --------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_allocator_testlib.cc b/lib/sanitizer_common/tests/sanitizer_allocator_testlib.cpp
similarity index 97%
rename from lib/sanitizer_common/tests/sanitizer_allocator_testlib.cc
rename to lib/sanitizer_common/tests/sanitizer_allocator_testlib.cpp
index 5970496..93af8be 100644
--- a/lib/sanitizer_common/tests/sanitizer_allocator_testlib.cc
+++ b/lib/sanitizer_common/tests/sanitizer_allocator_testlib.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_allocator_testlib.cc ------------------------------------===//
+//===-- sanitizer_allocator_testlib.cpp -----------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 /* Usage:
 clang++ -std=c++11 -fno-exceptions  -g -fPIC -I. -I../include -Isanitizer \
- sanitizer_common/tests/sanitizer_allocator_testlib.cc \
+ sanitizer_common/tests/sanitizer_allocator_testlib.cpp \
  $(\ls sanitizer_common/sanitizer_*.cpp | grep -v sanitizer_common_nolibc.cpp) \
   sanitizer_common/sanitizer_linux_x86_64.S \
  -shared -lpthread -o testmalloc.so
diff --git a/lib/sanitizer_common/tests/sanitizer_atomic_test.cc b/lib/sanitizer_common/tests/sanitizer_atomic_test.cpp
similarity index 98%
rename from lib/sanitizer_common/tests/sanitizer_atomic_test.cc
rename to lib/sanitizer_common/tests/sanitizer_atomic_test.cpp
index 37ba0fa..9a3078b 100644
--- a/lib/sanitizer_common/tests/sanitizer_atomic_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_atomic_test.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_atomic_test.cc ------------------------------------------===//
+//===-- sanitizer_atomic_test.cpp -----------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_bitvector_test.cc b/lib/sanitizer_common/tests/sanitizer_bitvector_test.cpp
similarity index 98%
rename from lib/sanitizer_common/tests/sanitizer_bitvector_test.cc
rename to lib/sanitizer_common/tests/sanitizer_bitvector_test.cpp
index 9f60503..d6e6148 100644
--- a/lib/sanitizer_common/tests/sanitizer_bitvector_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_bitvector_test.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_bitvector_test.cc ---------------------------------------===//
+//===-- sanitizer_bitvector_test.cpp --------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_bvgraph_test.cc b/lib/sanitizer_common/tests/sanitizer_bvgraph_test.cpp
similarity index 98%
rename from lib/sanitizer_common/tests/sanitizer_bvgraph_test.cc
rename to lib/sanitizer_common/tests/sanitizer_bvgraph_test.cpp
index 955b723..bb2f81f 100644
--- a/lib/sanitizer_common/tests/sanitizer_bvgraph_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_bvgraph_test.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_bvgraph_test.cc -----------------------------------------===//
+//===-- sanitizer_bvgraph_test.cpp ----------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_common_test.cc b/lib/sanitizer_common/tests/sanitizer_common_test.cpp
similarity index 99%
rename from lib/sanitizer_common/tests/sanitizer_common_test.cc
rename to lib/sanitizer_common/tests/sanitizer_common_test.cpp
index 2350de9..9c2b88d 100644
--- a/lib/sanitizer_common/tests/sanitizer_common_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_common_test.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_common_test.cc ------------------------------------------===//
+//===-- sanitizer_common_test.cpp -----------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_deadlock_detector_test.cc b/lib/sanitizer_common/tests/sanitizer_deadlock_detector_test.cpp
similarity index 99%
rename from lib/sanitizer_common/tests/sanitizer_deadlock_detector_test.cc
rename to lib/sanitizer_common/tests/sanitizer_deadlock_detector_test.cpp
index f68bb70..b4ec339 100644
--- a/lib/sanitizer_common/tests/sanitizer_deadlock_detector_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_deadlock_detector_test.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_deadlock_detector_test.cc -------------------------------===//
+//===-- sanitizer_deadlock_detector_test.cpp ------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_flags_test.cc b/lib/sanitizer_common/tests/sanitizer_flags_test.cpp
similarity index 98%
rename from lib/sanitizer_common/tests/sanitizer_flags_test.cc
rename to lib/sanitizer_common/tests/sanitizer_flags_test.cpp
index cfe90ef..63a7da6 100644
--- a/lib/sanitizer_common/tests/sanitizer_flags_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_flags_test.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_flags_test.cc -------------------------------------------===//
+//===-- sanitizer_flags_test.cpp ------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_format_interceptor_test.cc b/lib/sanitizer_common/tests/sanitizer_format_interceptor_test.cpp
similarity index 98%
rename from lib/sanitizer_common/tests/sanitizer_format_interceptor_test.cc
rename to lib/sanitizer_common/tests/sanitizer_format_interceptor_test.cpp
index 9f70fbc..4ed8072 100644
--- a/lib/sanitizer_common/tests/sanitizer_format_interceptor_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_format_interceptor_test.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_format_interceptor_test.cc ------------------------------===//
+//===-- sanitizer_format_interceptor_test.cpp -----------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_ioctl_test.cc b/lib/sanitizer_common/tests/sanitizer_ioctl_test.cpp
similarity index 97%
rename from lib/sanitizer_common/tests/sanitizer_ioctl_test.cc
rename to lib/sanitizer_common/tests/sanitizer_ioctl_test.cpp
index 738046a..8da09f6 100644
--- a/lib/sanitizer_common/tests/sanitizer_ioctl_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_ioctl_test.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_ioctl_test.cc -------------------------------------------===//
+//===-- sanitizer_ioctl_test.cpp ------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_libc_test.cc b/lib/sanitizer_common/tests/sanitizer_libc_test.cpp
similarity index 98%
rename from lib/sanitizer_common/tests/sanitizer_libc_test.cc
rename to lib/sanitizer_common/tests/sanitizer_libc_test.cpp
index d8f4759..1f213cd 100644
--- a/lib/sanitizer_common/tests/sanitizer_libc_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_libc_test.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_libc_test.cc --------------------------------------------===//
+//===-- sanitizer_libc_test.cpp -------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_linux_test.cc b/lib/sanitizer_common/tests/sanitizer_linux_test.cpp
similarity index 98%
rename from lib/sanitizer_common/tests/sanitizer_linux_test.cc
rename to lib/sanitizer_common/tests/sanitizer_linux_test.cpp
index a5ce5a2..1d8e7e8 100644
--- a/lib/sanitizer_common/tests/sanitizer_linux_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_linux_test.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_linux_test.cc -------------------------------------------===//
+//===-- sanitizer_linux_test.cpp ------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_list_test.cc b/lib/sanitizer_common/tests/sanitizer_list_test.cpp
similarity index 97%
rename from lib/sanitizer_common/tests/sanitizer_list_test.cc
rename to lib/sanitizer_common/tests/sanitizer_list_test.cpp
index 7dd28ee..6344423 100644
--- a/lib/sanitizer_common/tests/sanitizer_list_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_list_test.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_list_test.cc --------------------------------------------===//
+//===-- sanitizer_list_test.cpp -------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_mutex_test.cc b/lib/sanitizer_common/tests/sanitizer_mutex_test.cpp
similarity index 97%
rename from lib/sanitizer_common/tests/sanitizer_mutex_test.cc
rename to lib/sanitizer_common/tests/sanitizer_mutex_test.cpp
index ef1c5fa..2cfbaae 100644
--- a/lib/sanitizer_common/tests/sanitizer_mutex_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_mutex_test.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_mutex_test.cc -------------------------------------------===//
+//===-- sanitizer_mutex_test.cpp ------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_nolibc_test.cc b/lib/sanitizer_common/tests/sanitizer_nolibc_test.cpp
similarity index 93%
rename from lib/sanitizer_common/tests/sanitizer_nolibc_test.cc
rename to lib/sanitizer_common/tests/sanitizer_nolibc_test.cpp
index fdab296..41376ee 100644
--- a/lib/sanitizer_common/tests/sanitizer_nolibc_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_nolibc_test.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_nolibc_test.cc ------------------------------------------===//
+//===-- sanitizer_nolibc_test.cpp -----------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_nolibc_test_main.cc b/lib/sanitizer_common/tests/sanitizer_nolibc_test_main.cpp
similarity index 90%
rename from lib/sanitizer_common/tests/sanitizer_nolibc_test_main.cc
rename to lib/sanitizer_common/tests/sanitizer_nolibc_test_main.cpp
index 7002850..5c02bfb 100644
--- a/lib/sanitizer_common/tests/sanitizer_nolibc_test_main.cc
+++ b/lib/sanitizer_common/tests/sanitizer_nolibc_test_main.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_nolibc_test_main.cc -------------------------------------===//
+//===-- sanitizer_nolibc_test_main.cpp ------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_posix_test.cc b/lib/sanitizer_common/tests/sanitizer_posix_test.cpp
similarity index 97%
rename from lib/sanitizer_common/tests/sanitizer_posix_test.cc
rename to lib/sanitizer_common/tests/sanitizer_posix_test.cpp
index 6ceae7d..c903846 100644
--- a/lib/sanitizer_common/tests/sanitizer_posix_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_posix_test.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_posix_test.cc -------------------------------------------===//
+//===-- sanitizer_posix_test.cpp ------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_printf_test.cc b/lib/sanitizer_common/tests/sanitizer_printf_test.cpp
similarity index 98%
rename from lib/sanitizer_common/tests/sanitizer_printf_test.cc
rename to lib/sanitizer_common/tests/sanitizer_printf_test.cpp
index 26c0151..699a363 100644
--- a/lib/sanitizer_common/tests/sanitizer_printf_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_printf_test.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_printf_test.cc ------------------------------------------===//
+//===-- sanitizer_printf_test.cpp -----------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_procmaps_test.cc b/lib/sanitizer_common/tests/sanitizer_procmaps_test.cpp
similarity index 97%
rename from lib/sanitizer_common/tests/sanitizer_procmaps_test.cc
rename to lib/sanitizer_common/tests/sanitizer_procmaps_test.cpp
index 37ab3d9..08750c0 100644
--- a/lib/sanitizer_common/tests/sanitizer_procmaps_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_procmaps_test.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_procmaps_test.cc ----------------------------------------===//
+//===-- sanitizer_procmaps_test.cpp ---------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_quarantine_test.cc b/lib/sanitizer_common/tests/sanitizer_quarantine_test.cpp
similarity index 98%
rename from lib/sanitizer_common/tests/sanitizer_quarantine_test.cc
rename to lib/sanitizer_common/tests/sanitizer_quarantine_test.cpp
index 4088119..ee0ac6a 100644
--- a/lib/sanitizer_common/tests/sanitizer_quarantine_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_quarantine_test.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_quarantine_test.cc --------------------------------------===//
+//===-- sanitizer_quarantine_test.cpp -------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_ring_buffer_test.cc b/lib/sanitizer_common/tests/sanitizer_ring_buffer_test.cpp
similarity index 97%
rename from lib/sanitizer_common/tests/sanitizer_ring_buffer_test.cc
rename to lib/sanitizer_common/tests/sanitizer_ring_buffer_test.cpp
index e10cd36..91ec2f9 100644
--- a/lib/sanitizer_common/tests/sanitizer_ring_buffer_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_ring_buffer_test.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_vector_test.cc ------------------------------------------===//
+//===-- sanitizer_vector_test.cpp -----------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_stackdepot_test.cc b/lib/sanitizer_common/tests/sanitizer_stackdepot_test.cpp
similarity index 97%
rename from lib/sanitizer_common/tests/sanitizer_stackdepot_test.cc
rename to lib/sanitizer_common/tests/sanitizer_stackdepot_test.cpp
index 24f6fcf..a06413c 100644
--- a/lib/sanitizer_common/tests/sanitizer_stackdepot_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_stackdepot_test.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_stackdepot_test.cc --------------------------------------===//
+//===-- sanitizer_stackdepot_test.cpp -------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_stacktrace_printer_test.cc b/lib/sanitizer_common/tests/sanitizer_stacktrace_printer_test.cpp
similarity index 98%
rename from lib/sanitizer_common/tests/sanitizer_stacktrace_printer_test.cc
rename to lib/sanitizer_common/tests/sanitizer_stacktrace_printer_test.cpp
index b6d1bd1..1ce89a3 100644
--- a/lib/sanitizer_common/tests/sanitizer_stacktrace_printer_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_stacktrace_printer_test.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_common_printer_test.cc ----------------------------------===//
+//===-- sanitizer_common_printer_test.cpp ---------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_stacktrace_test.cc b/lib/sanitizer_common/tests/sanitizer_stacktrace_test.cpp
similarity index 98%
rename from lib/sanitizer_common/tests/sanitizer_stacktrace_test.cc
rename to lib/sanitizer_common/tests/sanitizer_stacktrace_test.cpp
index 771a3e4..afd4a0e 100644
--- a/lib/sanitizer_common/tests/sanitizer_stacktrace_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_stacktrace_test.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_stacktrace_test.cc --------------------------------------===//
+//===-- sanitizer_stacktrace_test.cpp -------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_stoptheworld_test.cc b/lib/sanitizer_common/tests/sanitizer_stoptheworld_test.cpp
similarity index 98%
rename from lib/sanitizer_common/tests/sanitizer_stoptheworld_test.cc
rename to lib/sanitizer_common/tests/sanitizer_stoptheworld_test.cpp
index 98e64d8..beb56cf 100644
--- a/lib/sanitizer_common/tests/sanitizer_stoptheworld_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_stoptheworld_test.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_stoptheworld_test.cc ------------------------------------===//
+//===-- sanitizer_stoptheworld_test.cpp -----------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_stoptheworld_testlib.cc b/lib/sanitizer_common/tests/sanitizer_stoptheworld_testlib.cpp
similarity index 86%
rename from lib/sanitizer_common/tests/sanitizer_stoptheworld_testlib.cc
rename to lib/sanitizer_common/tests/sanitizer_stoptheworld_testlib.cpp
index 033170e..e333bf0 100644
--- a/lib/sanitizer_common/tests/sanitizer_stoptheworld_testlib.cc
+++ b/lib/sanitizer_common/tests/sanitizer_stoptheworld_testlib.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_stoptheworld_testlib.cc ---------------------------------===//
+//===-- sanitizer_stoptheworld_testlib.cpp --------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -10,8 +10,8 @@
 //===----------------------------------------------------------------------===//
 /* Usage:
 clang++ -fno-exceptions -g -fPIC -I. \
- sanitizer_common/tests/sanitizer_stoptheworld_testlib.cc \
- sanitizer_common/sanitizer_*.cc -shared -lpthread -o teststoptheworld.so
+ sanitizer_common/tests/sanitizer_stoptheworld_testlib.cpp \
+ sanitizer_common/sanitizer_*.cpp -shared -lpthread -o teststoptheworld.so
 LD_PRELOAD=`pwd`/teststoptheworld.so /your/app
 */
 
diff --git a/lib/sanitizer_common/tests/sanitizer_suppressions_test.cc b/lib/sanitizer_common/tests/sanitizer_suppressions_test.cpp
similarity index 98%
rename from lib/sanitizer_common/tests/sanitizer_suppressions_test.cc
rename to lib/sanitizer_common/tests/sanitizer_suppressions_test.cpp
index d64379a..8bbb11c 100644
--- a/lib/sanitizer_common/tests/sanitizer_suppressions_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_suppressions_test.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_suppressions_test.cc ------------------------------------===//
+//===-- sanitizer_suppressions_test.cpp -----------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_symbolizer_test.cc b/lib/sanitizer_common/tests/sanitizer_symbolizer_test.cpp
similarity index 96%
rename from lib/sanitizer_common/tests/sanitizer_symbolizer_test.cc
rename to lib/sanitizer_common/tests/sanitizer_symbolizer_test.cpp
index e6bdeaa..1e70c14 100644
--- a/lib/sanitizer_common/tests/sanitizer_symbolizer_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_symbolizer_test.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_symbolizer_test.cc --------------------------------------===//
+//===-- sanitizer_symbolizer_test.cpp -------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_test_main.cc b/lib/sanitizer_common/tests/sanitizer_test_main.cpp
similarity index 91%
rename from lib/sanitizer_common/tests/sanitizer_test_main.cc
rename to lib/sanitizer_common/tests/sanitizer_test_main.cpp
index 8edee74..caab5ec 100644
--- a/lib/sanitizer_common/tests/sanitizer_test_main.cc
+++ b/lib/sanitizer_common/tests/sanitizer_test_main.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_test_main.cc --------------------------------------------===//
+//===-- sanitizer_test_main.cpp -------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_thread_registry_test.cc b/lib/sanitizer_common/tests/sanitizer_thread_registry_test.cpp
similarity index 98%
rename from lib/sanitizer_common/tests/sanitizer_thread_registry_test.cc
rename to lib/sanitizer_common/tests/sanitizer_thread_registry_test.cpp
index 09c01d6..6c380f1 100644
--- a/lib/sanitizer_common/tests/sanitizer_thread_registry_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_thread_registry_test.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_thread_registry_test.cc ---------------------------------===//
+//===-- sanitizer_thread_registry_test.cpp --------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_type_traits_test.cc b/lib/sanitizer_common/tests/sanitizer_type_traits_test.cpp
similarity index 94%
rename from lib/sanitizer_common/tests/sanitizer_type_traits_test.cc
rename to lib/sanitizer_common/tests/sanitizer_type_traits_test.cpp
index ccefeb6..40f6e47 100644
--- a/lib/sanitizer_common/tests/sanitizer_type_traits_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_type_traits_test.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_type_traits_test.cc -------------------------------------===//
+//===-- sanitizer_type_traits_test.cpp ------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/sanitizer_vector_test.cc b/lib/sanitizer_common/tests/sanitizer_vector_test.cpp
similarity index 94%
rename from lib/sanitizer_common/tests/sanitizer_vector_test.cc
rename to lib/sanitizer_common/tests/sanitizer_vector_test.cpp
index 5d96e9b..771319c 100644
--- a/lib/sanitizer_common/tests/sanitizer_vector_test.cc
+++ b/lib/sanitizer_common/tests/sanitizer_vector_test.cpp
@@ -1,4 +1,4 @@
-//===-- sanitizer_vector_test.cc ------------------------------------------===//
+//===-- sanitizer_vector_test.cpp -----------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/lib/sanitizer_common/tests/standalone_malloc_test.cc b/lib/sanitizer_common/tests/standalone_malloc_test.cpp
similarity index 100%
rename from lib/sanitizer_common/tests/standalone_malloc_test.cc
rename to lib/sanitizer_common/tests/standalone_malloc_test.cpp