[chrome_elf] Big ELF cleanup. Part 1.

chrome_elf/blacklist/blacklist_interceptions.cc

Index: chrome_elf/blacklist/blacklist_interceptions.cc
diff --git a/chrome_elf/blacklist/blacklist_interceptions.cc b/chrome_elf/blacklist/blacklist_interceptions.cc
index 7d97d85f3f73f17d35d820f435fff5f4c35541f1..2f508d4163d98d3753801d62d0b00304393c0ad1 100644
--- a/chrome_elf/blacklist/blacklist_interceptions.cc
+++ b/chrome_elf/blacklist/blacklist_interceptions.cc
@@ -18,7 +18,7 @@
 // base_static (see base/base.gyp) are allowed here.
 #include "base/win/pe_image.h"
 #include "chrome_elf/blacklist/blacklist.h"
-#include "chrome_elf/blacklist/crashpad_helper.h"
+#include "chrome_elf/crash/crash_helper.h"
 #include "sandbox/win/src/internal_types.h"
 #include "sandbox/win/src/nt_internals.h"
 #include "sandbox/win/src/sandbox_nt_util.h"
@@ -262,7 +262,7 @@ BlNtMapViewOfSection(NtMapViewOfSectionFunction orig_MapViewOfSection,
                                    base, zero_bits, commit_size, offset,
                                    view_size, inherit, allocation_type,
                                    protect);
-  } __except(GenerateCrashDump(GetExceptionInformation())) {
+  } __except (elf_crash::GenerateCrashDump(GetExceptionInformation())) {
   }
 
   return ret;