Remove the nested #ifdef ADDRESS_SANITIZER

base/process_util_unittest.cc

Index: base/process_util_unittest.cc
===================================================================
--- base/process_util_unittest.cc	(revision 114978)
+++ base/process_util_unittest.cc	(working copy)
@@ -892,12 +892,11 @@
 // 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()
@@ -1130,8 +1129,6 @@
 #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)