Revert of Enable ASan default options on Mac.

build/sanitizers/sanitizer_options.cc

 // Copyright 2014 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 the default options for various compiler-based dynamic
 // tools.
 
 #include "build/build_config.h"
 
-#if defined(ADDRESS_SANITIZER) && defined(OS_MACOSX)
-#include <crt_externs.h>  // for _NSGetArgc, _NSGetArgv
-#include <string.h>
-#endif  // ADDRESS_SANITIZER && OS_MACOSX
-
 // Functions returning default options are declared weak in the tools' runtime
 // libraries. To make the linker pick the strong replacements for those
 // functions from this module, we explicitly force its inclusion by passing
 // -Wl,-u_sanitizer_options_link_helper
 extern "C"
 void _sanitizer_options_link_helper() { }
 
 #if defined(ADDRESS_SANITIZER)
 // Default options for AddressSanitizer in various configurations:
 //   strict_memcmp=1 - disable the strict memcmp() checking
@@ skipping 34 matching lines @@
 // Default AddressSanitizer options for buildbots and non-official builds.
 const char *kAsanDefaultOptions =
     "strict_memcmp=0 symbolize=false check_printf=1 use_sigaltstack=1 "
     "detect_leaks=0 strip_path_prefix=Release/../../ ";
 #endif  // GOOGLE_CHROME_BUILD
 
 #elif defined(OS_MACOSX)
 const char *kAsanDefaultOptions =
     "strict_memcmp=0 replace_intrin=0 check_printf=1 use_sigaltstack=1 "
     "strip_path_prefix=Release/../../ ";
-static const char kNaClDefaultOptions[] = "handle_segv=0";
-static const char kNaClFlag[] = "--type=nacl-loader";
 #endif  // OS_LINUX
 
 #if defined(OS_LINUX) || defined(OS_MACOSX)
 extern "C"
 __attribute__((no_sanitize_address))
 __attribute__((visibility("default")))
 // The function isn't referenced from the executable itself. Make sure it isn't
 // stripped by the linker.
 __attribute__((used))
 const char *__asan_default_options() {
-#if defined(OS_MACOSX)
-  char*** argvp = _NSGetArgv();
-  int* argcp = _NSGetArgc();
-  if (!argvp || !argcp) return kAsanDefaultOptions;
-  char** argv = *argvp;
-  int argc = *argcp;
-  for (int i = 0; i < argc; ++i) {
-    if (strcmp(argv[i], kNaClFlag) == 0) {
-      return kNaClDefaultOptions;
-    }
-  }
-#endif
   return kAsanDefaultOptions;
 }
 #endif  // OS_LINUX || OS_MACOSX
 #endif  // ADDRESS_SANITIZER
 
 #if defined(THREAD_SANITIZER) && defined(OS_LINUX)
 // Default options for ThreadSanitizer in various configurations:
 //   detect_deadlocks=1 - enable deadlock (lock inversion) detection.
 //   second_deadlock_stack=1 - more verbose deadlock reports.
 //   report_signal_unsafe=0 - do not report async-signal-unsafe functions
@@ skipping 26 matching lines @@
 __attribute__((no_sanitize_thread))
 __attribute__((visibility("default")))
 // The function isn't referenced from the executable itself. Make sure it isn't
 // stripped by the linker.
 __attribute__((used))
 const char *__tsan_default_suppressions() {
   return kTSanDefaultSuppressions;
 }
 
 #endif  // THREAD_SANITIZER && OS_LINUX