Revert of Enable ASan default options on Mac. (patchset #4 id:60001 of https://codereview.chromium.org/581983003/)

Reason for revert:
This CL broke ui_unittests on both Mac ASan and Mac ASan 64 bots:

/Volumes/data/bool/build/slave/Mac_ASan_Tests__2_/build/src/out/Release/ui_unittests --brave-new-test-launcher --test-launcher-bot-mode --verbose --test-launcher-print-test-stdio=always --gtest_print_time --test-launcher-summary-output=/tmp/tmpnPVxX8
dyld: Library not loaded: @executable_path/../Versions/1.0.0.0/ui_unittests Framework.framework/ui_unittests Framework
  Referenced from: /Volumes/data/bool/build/slave/Mac_ASan_Tests__2_/build/src/out/Release/ui_unittests
  Reason: image not found

http://build.chromium.org/p/chromium.memory/builders/Mac%20ASan%20Tests%20%282%29/builds/5393/steps/ui_unittests/logs/stdio

Original issue's description:
> Enable ASan default options on Mac.
>
> This CL links libsanitizer_options into every executable built with ASan on OSX.
> The existing implementation of __asan_default_options for Chromium.app is merged with that in sanitizer_options.cc
>
> Also now use_sanitizer_options is only set when building with sanitizers so that there isn't an unconditional dependency on an empty object file in every executable in non-sanitizer builds.
>
> BUG=302040
> [email protected]
>
> Committed: https://crrev.com/0640a5d19ef72aec62787423e8a7c78c4f62b955
> Cr-Commit-Position: refs/heads/master@{#295958}

[email protected],[email protected]
NOTREECHECKS=true
NOTRY=true
BUG=302040

Review URL: https://codereview.chromium.org/593683004

Cr-Commit-Position: refs/heads/master@{#295987}

Author: glider

build/common.gypi

@@ -389,7 +389,7 @@
 
       # Enable Chromium overrides of the default configurations for various
       # dynamic tools (like ASan).
-      'use_sanitizer_options%': 0,
+      'use_sanitizer_options%': 1,
 
       # Enable building with SyzyAsan.
       # See https://code.google.com/p/sawbuck/wiki/SyzyASanHowTo
@@ -2140,7 +2140,6 @@
       ['asan==1 or msan==1 or lsan==1 or tsan==1', {
         'clang%': 1,
         'use_allocator%': 'none',
-        'use_sanitizer_options%': 1,
       }],
       ['asan==1 and OS=="linux" and chromeos==0', {
         'use_custom_libcxx%': 1,
@@ -3481,14 +3480,6 @@
           '-Wl,-z,now',
           '-Wl,-z,relro',
         ],
-        # TODO(glider): enable the default options on other systems.
-        'conditions': [
-          ['use_sanitizer_options==1 and ((OS=="linux" and (chromeos==0 or target_arch!="ia32")) or OS=="mac")', {
-            'dependencies': [
-              '<(DEPTH)/build/sanitizers/sanitizers.gyp:sanitizer_options',
-            ],
-          }],
-        ],
       },
     }],
     # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580
@@ -4105,6 +4096,14 @@
                 ],
               }],
             ],
+            # TODO(glider): enable the default options on other systems.
+            'conditions': [
+              ['use_sanitizer_options==1 and OS=="linux" and (chromeos==0 or target_arch!="ia32")', {
+                'dependencies': [
+                  '<(DEPTH)/build/sanitizers/sanitizers.gyp:sanitizer_options',
+                ],
+              }],
+            ],
           }],
           ['asan==1', {
             'target_conditions': [

build/sanitizers/sanitizer_options.cc

@@ -7,11 +7,6 @@
 
 #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
@@ -66,8 +61,6 @@ const char *kAsanDefaultOptions =
 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)
@@ -78,18 +71,6 @@ __attribute__((visibility("default")))
 // 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

build/sanitizers/sanitizers.gyp

@@ -45,15 +45,6 @@
         'ldflags': [
           '-Wl,-u_sanitizer_options_link_helper',
         ],
-        'target_conditions': [
-          ['_type=="executable"', {
-            'xcode_settings': {
-              'OTHER_LDFLAGS': [
-                '-Wl,-u,__sanitizer_options_link_helper',
-              ],
-            },
-          }],
-        ],
       },
     },
   ],

chrome/app/chrome_exe_main_mac.cc

@@ -5,8 +5,45 @@
 // The entry point for all Mac Chromium processes, including the outer app
 // bundle (browser) and helper app (renderer, plugin, and friends).
 
+#if defined(ADDRESS_SANITIZER)
+#include <crt_externs.h>  // for _NSGetArgc, _NSGetArgv
+#include <string.h>
+#endif  // ADDRESS_SANITIZER
 #include <stdlib.h>
 
+#if defined(ADDRESS_SANITIZER)
+// NaCl requires its own SEGV handler, so we need to add handle_segv=0 to
+// ASAN_OPTIONS. This is done by injecting __asan_default_options into the
+// executable.
+// Because there's no distinct NaCl executable on OSX, we have to look at the
+// command line arguments to understand whether the process is a NaCl loader.
+
+static const char kNaClDefaultOptions[] = "handle_segv=0";
+static const char kNaClFlag[] = "--type=nacl-loader";
+
+extern "C"
+// __asan_default_options() is called at ASan initialization, so it must
+// not be instrumented with ASan -- thus the "no_sanitize_address" attribute.
+__attribute__((no_sanitize_address))
+// The function isn't referenced from the executable itself. Make sure it isn't
+// stripped by the linker.
+__attribute__((used))
+__attribute__((visibility("default")))
+const char* __asan_default_options()  {
+  char*** argvp = _NSGetArgv();
+  int* argcp = _NSGetArgc();
+  if (!argvp || !argcp) return NULL;
+  char** argv = *argvp;
+  int argc = *argcp;
+  for (int i = 0; i < argc; ++i) {
+    if (strcmp(argv[i], kNaClFlag) == 0) {
+      return kNaClDefaultOptions;
+    }
+  }
+  return NULL;
+}
+#endif  // ADDRESS_SANITIZER
+
 extern "C" {
 int ChromeMain(int argc, char** argv);
 }  // extern "C"

chrome/app/framework.order

@@ -46,9 +46,6 @@ ___gcov_flush
 ___gcov_merge_add
 ___gcov_fork
 
-# Provided by build/sanitizers/sanitizer_options.cc in ASan builds.
-___asan_default_options
-
 # Written in asm as a .globl.  (Is that necessary?)
 _NaClSwitch
 _NaClSyscallSeg