Revert of [chrome_elf] Big cleanup and removing dependencies that recently crept in. Part 1.

chrome_elf/blacklist/blacklist_interceptions.cc

 // Copyright 2013 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.
 //
 // Implementation of NtMapViewOfSection intercept for 32 bit builds.
 //
 // TODO(robertshield): Implement the 64 bit intercept.
 
 #include "chrome_elf/blacklist/blacklist_interceptions.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <string>
 #include <vector>
 
 // Note that only #includes from base that are either header-only or built into
 // base_static (see base/base.gyp) are allowed here.
 #include "base/win/pe_image.h"
 #include "chrome_elf/blacklist/blacklist.h"
-#include "chrome_elf/crash/crash_helper.h"
+#include "chrome_elf/blacklist/crashpad_helper.h"
 #include "sandbox/win/src/internal_types.h"
 #include "sandbox/win/src/nt_internals.h"
 #include "sandbox/win/src/sandbox_nt_util.h"
 #include "sandbox/win/src/sandbox_types.h"
 
 namespace {
 
 NtQuerySectionFunction g_nt_query_section_func = NULL;
 NtQueryVirtualMemoryFunction g_nt_query_virtual_memory_func = NULL;
 NtUnmapViewOfSectionFunction g_nt_unmap_view_of_section_func = NULL;
@@ skipping 223 matching lines @@
                      SECTION_INHERIT inherit,
                      ULONG allocation_type,
                      ULONG protect) {
   NTSTATUS ret = STATUS_UNSUCCESSFUL;
 
   __try {
     ret = BlNtMapViewOfSectionImpl(orig_MapViewOfSection, section, process,
                                    base, zero_bits, commit_size, offset,
                                    view_size, inherit, allocation_type,
                                    protect);
-  } __except (elf_crash::GenerateCrashDump(GetExceptionInformation())) {
+  } __except(GenerateCrashDump(GetExceptionInformation())) {
   }
 
   return ret;
 }
 
 #if defined(_WIN64)
 NTSTATUS WINAPI BlNtMapViewOfSection64(
     HANDLE section, HANDLE process, PVOID *base, ULONG_PTR zero_bits,
     SIZE_T commit_size, PLARGE_INTEGER offset, PSIZE_T view_size,
     SECTION_INHERIT inherit, ULONG allocation_type, ULONG protect) {
   return BlNtMapViewOfSection(g_nt_map_view_of_section_func, section, process,
                               base, zero_bits, commit_size, offset, view_size,
                               inherit, allocation_type, protect);
 }
 #endif
 }  // namespace blacklist