| Index: chrome_elf/BUILD.gn
 | 
| diff --git a/chrome_elf/BUILD.gn b/chrome_elf/BUILD.gn
 | 
| index a3ba1b4269f0da8b68f9819fd6f990c135427952..e7d27b21482f69cddb9042748f08f2c221b8fbe3 100644
 | 
| --- a/chrome_elf/BUILD.gn
 | 
| +++ b/chrome_elf/BUILD.gn
 | 
| @@ -35,7 +35,6 @@ shared_library("chrome_elf") {
 | 
|    ]
 | 
|    deps = [
 | 
|      ":blacklist",
 | 
| -    ":breakpad",
 | 
|      ":chrome_elf_manifest",
 | 
|      ":chrome_elf_resources",
 | 
|      ":common",
 | 
| @@ -45,6 +44,7 @@ shared_library("chrome_elf") {
 | 
|      "//components/crash/content/app",
 | 
|      "//components/crash/core/common",
 | 
|      "//content/public/common:result_codes",
 | 
| +    "//third_party/crashpad/crashpad/client:client",
 | 
|    ]
 | 
|    configs += [ "//build/config/win:windowed" ]
 | 
|    configs -= [ "//build/config/win:console" ]
 | 
| @@ -87,21 +87,6 @@ source_set("common") {
 | 
|    ]
 | 
|  }
 | 
|  
 | 
| -source_set("breakpad") {
 | 
| -  include_dirs = [ "$target_gen_dir" ]
 | 
| -  sources = [
 | 
| -    "breakpad.cc",
 | 
| -    "breakpad.h",
 | 
| -  ]
 | 
| -  deps = [
 | 
| -    ":common",
 | 
| -    "//base",
 | 
| -    "//breakpad:breakpad_handler",
 | 
| -    "//chrome/common:version_header",
 | 
| -    "//chrome/install_static:install_static_util",
 | 
| -  ]
 | 
| -}
 | 
| -
 | 
|  source_set("dll_hash") {
 | 
|    deps = [
 | 
|      "//base",
 | 
| @@ -129,16 +114,19 @@ static_library("blacklist") {
 | 
|      "blacklist/blacklist.h",
 | 
|      "blacklist/blacklist_interceptions.cc",
 | 
|      "blacklist/blacklist_interceptions.h",
 | 
| +    "blacklist/crashpad_helper.cc",
 | 
| +    "blacklist/crashpad_helper.h",
 | 
|    ]
 | 
|    public_deps = [
 | 
|      "//sandbox",
 | 
|    ]
 | 
|    deps = [
 | 
| -    ":breakpad",
 | 
|      ":common",
 | 
|      ":constants",
 | 
|      "//base",
 | 
|      "//chrome/install_static:install_static_util",
 | 
| +    "//components/crash/content/app",
 | 
| +    "//third_party/crashpad/crashpad/client:client",
 | 
|    ]
 | 
|  }
 | 
|  
 | 
| @@ -203,6 +191,18 @@ shared_library("blacklist_test_main_dll") {
 | 
|      "//build/config/sanitizers:deps",
 | 
|      "//chrome/install_static:install_static_util",
 | 
|    ]
 | 
| +  ldflags = [
 | 
| +    "/NODEFAULTLIB:user32.lib",
 | 
| +    "/DELAYLOAD:dbghelp.dll",
 | 
| +    "/DELAYLOAD:ole32.dll",
 | 
| +    "/DELAYLOAD:psapi.dll",
 | 
| +    "/DELAYLOAD:rpcrt4.dll",
 | 
| +    "/DELAYLOAD:shell32.dll",
 | 
| +    "/DELAYLOAD:user32.dll",
 | 
| +    "/DELAYLOAD:winhttp.dll",
 | 
| +    "/DELAYLOAD:winmm.dll",
 | 
| +    "/DELAYLOAD:ws2_32.dll",
 | 
| +  ]
 | 
|  }
 | 
|  
 | 
|  loadable_module("blacklist_test_dll_1") {
 | 
| 
 |