Pull Chrome_Elf out of the renderer process

(since we neither redirect nor blacklist anything in there
anyways, and we're currently causing some crashes).

BUG=477137

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

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

7 files changed, 4 insertions, 21 deletions

diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index b2282d3..9972fdb 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -263,7 +263,6 @@ if (is_multi_dll_chrome) {
     ]
 
     if (is_win) {
-      deps += [ "//chrome_elf" ]
       # TODO(GYP): PGO on Windows.
       # ['chrome_pgo_phase==1', {
       #   'msvs_settings': {
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 94a61a6..76171b2 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -352,9 +352,6 @@
           ],
           'conditions': [
             ['OS=="win"', {
-              'dependencies': [
-                '<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_elf',
-              ],
               'conditions': [
                 ['chrome_pgo_phase==1', {
                   'msvs_settings': {
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index 5689607..9bcc3db 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -377,7 +377,6 @@
         }],
         ['OS=="win"', {
           'dependencies': [
-            '../chrome_elf/chrome_elf.gyp:chrome_elf',
             '../components/components.gyp:dom_distiller_core',  # Needed by chrome_content_renderer_client.cc.
           ],
           'include_dirs': [
diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
index 5912f86e..794934e 100644
--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn
@@ -159,10 +159,7 @@ static_library("renderer") {
     deps += [ "//third_party/mach_override" ]
   }
   if (is_win) {
-    deps += [
-      "//chrome_elf",
-      "//third_party/wtl",
-    ]
+    deps += [ "//third_party/wtl" ]
   }
   if (!is_android) {
     sources +=
diff --git a/chrome/renderer/DEPS b/chrome/renderer/DEPS
index 04489f4..90f559c 100644
--- a/chrome/renderer/DEPS
+++ b/chrome/renderer/DEPS
@@ -1,6 +1,5 @@
 include_rules = [
   "+chrome/grit",  # For generated headers
-  "+chrome_elf",
   "+components/autofill/content/common",
   "+components/autofill/content/renderer",
   "+components/autofill/core/common",
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 03325bb..30ca6f0 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -154,10 +154,6 @@
 #include "chrome/renderer/media/webrtc_logging_message_filter.h"
 #endif
 
-#if defined(OS_WIN)
-#include "chrome_elf/blacklist/blacklist.h"
-#endif
-
 using autofill::AutofillAgent;
 using autofill::PasswordAutofillAgent;
 using autofill::PasswordGenerationAgent;
@@ -501,13 +497,6 @@ void ChromeContentRendererClient::RenderThreadStarted() {
   WebSecurityPolicy::registerURLSchemeAsBypassingContentSecurityPolicy(
       extension_resource_scheme);
 
-#if defined(OS_WIN)
-  // Report if the renderer process has been patched by chrome_elf.
-  // TODO(csharp): Remove once the renderer is no longer getting
-  // patched this way.
-  if (blacklist::IsBlacklistInitialized())
-    UMA_HISTOGRAM_BOOLEAN("Blacklist.PatchedInRenderer", true);
-#endif
 #if defined(ENABLE_PRINT_PREVIEW)
   pdf_print_client_.reset(new ChromePDFPrintClient());
   pdf::PepperPDFHost::SetPrintClient(pdf_print_client_.get());
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 4dbeb51..ea29cad 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -2481,6 +2481,9 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="Blacklist.PatchedInRenderer" enum="BooleanHit">
+  <obsolete>
+    Removed at 2015 July.
+  </obsolete>
   <owner>csharp@chromium.org</owner>
   <summary>
     Counts the number of times a renderer process is started with the browser