Work around Clang's new -Wmismatched-new-delete warning.

base/tools_sanity_unittest.cc

 // Copyright (c) 2012 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.
 //
 // This file contains intentional memory errors, some of which may lead to
 // crashes if the test is ran without special memory testing tools. We use these
 // errors to verify the sanity of the tools.
 
 #include "base/atomicops.h"
 #include "base/debug/asan_invalid_access.h"
@@ skipping 127 matching lines @@
 }
 
 TEST(ToolsSanityTest, MAYBE_AccessesToMallocMemory) {
   char *foo = reinterpret_cast<char*>(malloc(10));
   MakeSomeErrors(foo, 10);
   free(foo);
   // Use after free.
   HARMFUL_ACCESS(foo[5] = 0, "heap-use-after-free");
 }
 
+static int* allocateArray() {
+  // Clang warns about the mismatched new[]/delete if they occur in the same
+  // function.
+  return new int[10];
+}
+
 TEST(ToolsSanityTest, MAYBE_ArrayDeletedWithoutBraces) {
 #if !defined(ADDRESS_SANITIZER) && !defined(SYZYASAN)
   // This test may corrupt memory if not run under Valgrind or compiled with
   // AddressSanitizer.
   if (!RunningOnValgrind())
     return;
 #endif
 
   // Without the |volatile|, clang optimizes away the next two lines.
-  int* volatile foo = new int[10];
+  int* volatile foo = allocateArray();
   delete foo;
 }
 
+static int* allocateScalar() {
+  // Clang warns about the mismatched new/delete[] if they occur in the same
+  // function.
+  return new int;
+}
+
 TEST(ToolsSanityTest, MAYBE_SingleElementDeletedWithBraces) {
 #if !defined(ADDRESS_SANITIZER)
   // This test may corrupt memory if not run under Valgrind or compiled with
   // AddressSanitizer.
   if (!RunningOnValgrind())
     return;
 #endif
 
   // Without the |volatile|, clang optimizes away the next two lines.
-  int* volatile foo = new int;
+  int* volatile foo = allocateScalar();
   (void) foo;
   delete [] foo;
 }
 
 #if defined(ADDRESS_SANITIZER) || defined(SYZYASAN)
 
 TEST(ToolsSanityTest, DISABLED_AddressSanitizerNullDerefCrashTest) {
   // Intentionally crash to make sure AddressSanitizer is running.
   // This test should not be ran on bots.
   int* volatile zero = NULL;
@@ skipping 140 matching lines @@
 
 TEST(ToolsSanityTest, AtomicsAreIgnored) {
   base::subtle::Atomic32 shared = 0;
   ReleaseStoreThread thread1(&shared);
   AcquireLoadThread thread2(&shared);
   RunInParallel(&thread1, &thread2);
   EXPECT_EQ(kMagicValue, shared);
 }
 
 }  // namespace base