Remove the nested #ifdef ADDRESS_SANITIZER

base/process_util_unittest.cc

 // Copyright (c) 2011 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.
 
 #define _CRT_SECURE_NO_WARNINGS
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/eintr_wrapper.h"
@@ skipping 874 matching lines @@
 
 #if defined(USE_TCMALLOC)
 extern "C" {
 int tc_set_new_mode(int mode);
 }
 #endif  // defined(USE_TCMALLOC)
 
 // Android doesn't implement set_new_handler, so we can't use the
 // OutOfMemoryTest cases.
 // OpenBSD does not support these tests either.
-#if !defined(OS_ANDROID) && !defined(OS_OPENBSD)
-
 // AddressSanitizer defines the malloc()/free()/etc. functions so that they
 // don't crash if the program is out of memory, so the OOM tests aren't supposed
 // to work.
-#if !defined(ADDRESS_SANITIZER)
+#if !defined(OS_ANDROID) && !defined(OS_OPENBSD) && !defined(ADDRESS_SANITIZER)

[M-A Ruel, 2011/12/20 14:42:45]

Actually, move all these with OS_WIN above.

[Alexander Potapenko, 2011/12/20 15:14:10]

Done.

+
 class OutOfMemoryDeathTest : public testing::Test {
  public:
   OutOfMemoryDeathTest()
       : value_(NULL),
         // Make test size as large as possible minus a few pages so
         // that alignment or other rounding doesn't make it wrap.
         test_size_(std::numeric_limits<std::size_t>::max() - 12 * 1024),
         signed_test_size_(std::numeric_limits<ssize_t>::max()) {
   }
 
@@ skipping 212 matching lines @@
 TEST_F(OutOfMemoryDeathTest, PsychoticallyBigObjCObject) {
   ASSERT_DEATH({
       SetUpInDeathAssert();
       while ((value_ = base::AllocatePsychoticallyBigObjCObject())) {}
     }, "");
 }
 
 #endif  // !ARCH_CPU_64_BITS
 #endif  // OS_MACOSX
 
-#endif  // !defined(ADDRESS_SANITIZER)
-
 #endif  // !defined(OS_ANDROID)

[M-A Ruel, 2011/12/20 14:42:45]

Please update

[Alexander Potapenko, 2011/12/20 15:14:10]

Done.

 
 #endif  // !defined(OS_WIN)