Revert of Patch to try dump-on-DCHECK.

build/common.gypi

 # 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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 704 matching lines @@
       # Whether the entire browser uses toolkit-views on Mac instead of Cocoa.
       'mac_views_browser%': 0,
 
       # By default, use ICU data file (icudtl.dat).
       'icu_use_data_file_flag%': 1,
 
       # Turn on JNI generation optimizations by default.
       'optimize_jni_generation%': 1,
 
       'conditions': [
-        # In Windows official builds, enable DCHECK as dump-without-crashing.
-        ['OS=="win" and buildtype=="Official"', {
-          'dcheck_always_on%': 1,
-          'dcheck_is_dump_without_crash': 1,
-        }, {
-          'dcheck_always_on%': 0,
-          'dcheck_is_dump_without_crash': 0,
-        }],
-
         # A flag for POSIX platforms
         ['OS=="win"', {
           'os_posix%': 0,
         }, {
           'os_posix%': 1,
         }],
 
         # A flag for BSD platforms
         ['OS=="freebsd" or OS=="openbsd"', {
           'os_bsd%': 1,
@@ skipping 451 matching lines @@
     'is_cast_desktop_build%': '<(is_cast_desktop_build)',
     'enable_viewport%': '<(enable_viewport)',
     'enable_hidpi%': '<(enable_hidpi)',
     'enable_topchrome_md%': '<(enable_topchrome_md)',
     'enable_wayland_server%': '<(enable_wayland_server)',
     'enable_wifi_display%': '<(enable_wifi_display)',
     'image_loader_extension%': '<(image_loader_extension)',
     'fastbuild%': '<(fastbuild)',
     'win_z7%': '<(win_z7)',
     'dcheck_always_on%': '<(dcheck_always_on)',
-    'dcheck_is_dump_without_crash%': '<(dcheck_is_dump_without_crash)',
     'tracing_like_official_build%': '<(tracing_like_official_build)',
     'fieldtrial_testing_like_official_build%': '<(fieldtrial_testing_like_official_build)',
     'arm_version%': '<(arm_version)',
     'arm_neon%': '<(arm_neon)',
     'arm_neon_optional%': '<(arm_neon_optional)',
     'sysroot%': '<(sysroot)',
     'use_sysroot%': '<(use_sysroot)',
     'pkg-config%': '<(pkg-config)',
     'chroot_cmd%': '<(chroot_cmd)',
     'system_libdir%': '<(system_libdir)',
@@ skipping 1636 matching lines @@
           ['OS=="android" and fastbuild==1', {
             # TODO(thakis): Change this to -g1 once http://crbug.com/456947 is
             # fixed.
             'variables': { 'release_extra_cflags': '-g0', },
           }],
         ],
       }],  # fastbuild!=0
       ['dcheck_always_on!=0', {
         'defines': ['DCHECK_ALWAYS_ON=1'],
       }],  # dcheck_always_on!=0
-      ['dcheck_is_dump_without_crash!=0', {
-        'defines': ['DCHECK_IS_DUMP_WITHOUT_CRASH=1'],
-      }],  # dcheck_is_dump_without_crash!=0
       ['tracing_like_official_build!=0', {
         'defines': ['TRACING_IS_OFFICIAL_BUILD=1'],
       }],  # tracing_like_official_build!=0
       ['fieldtrial_testing_like_official_build==0 and branding!="Chrome"', {
         'defines': ['FIELDTRIAL_TESTING_ENABLED'],
       }],  # fieldtrial_testing_like_official_build==0 and branding!="Chrome"
       ['OS=="win"', {
         'defines': ['NO_TCMALLOC'],
         'conditions': [
           ['win_use_allocator_shim==1', {
@@ skipping 3521 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }