Revert 251095 "Revert 250828 "Add a UMA stat to track if the Bro..."

trunk/src/chrome/renderer/chrome_content_renderer_client.cc

 // 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.
 
 #include "chrome/renderer/chrome_content_renderer_client.h"
 
 #include "base/command_line.h"
 #include "base/debug/crash_logging.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
@@ skipping 98 matching lines @@
 
 #if defined(ENABLE_WEBRTC)
 #include "chrome/renderer/media/webrtc_logging_message_filter.h"
 #endif
 
 #if defined(ENABLE_SPELLCHECK)
 #include "chrome/renderer/spellchecker/spellcheck.h"
 #include "chrome/renderer/spellchecker/spellcheck_provider.h"
 #endif
 
+#if defined(OS_WIN)
+#include "chrome_elf/blacklist/blacklist.h"
+#endif  // OS_WIN
+
 using autofill::AutofillAgent;
 using autofill::PasswordAutofillAgent;
 using autofill::PasswordGenerationAgent;
 using base::ASCIIToUTF16;
 using base::UserMetricsAction;
 using content::RenderThread;
 using content::WebPluginInfo;
 using extensions::Extension;
 using blink::WebCache;
 using blink::WebConsoleMessage;
@@ skipping 217 matching lines @@
 
   // chrome-extension: resources should bypass Content Security Policy checks
   // when included in protected resources.
   WebSecurityPolicy::registerURLSchemeAsBypassingContentSecurityPolicy(
       extension_scheme);
   WebSecurityPolicy::registerURLSchemeAsBypassingContentSecurityPolicy(
       extension_resource_scheme);
 
   extensions::ExtensionsClient::Set(
       extensions::ChromeExtensionsClient::GetInstance());
+
+#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.
+  typedef bool(*IsBlacklistInitializedFunc)();
+  IsBlacklistInitializedFunc is_blacklist_initialized =
+      reinterpret_cast<IsBlacklistInitializedFunc>(
+          GetProcAddress(GetModuleHandle(L"chrome_elf.dll"),
+                         "IsBlacklistInitialized"));
+  if (is_blacklist_initialized())
+    UMA_HISTOGRAM_BOOLEAN("Blacklist.PatchedInRenderer", true);
+#endif
 }
 
 void ChromeContentRendererClient::RenderFrameCreated(
     content::RenderFrame* render_frame) {
   new ChromeRenderFrameObserver(render_frame);
 
   ContentSettingsObserver* content_settings =
       new ContentSettingsObserver(render_frame, extension_dispatcher_.get());
   if (chrome_observer_.get()) {
     content_settings->SetContentSettingRules(
@@ skipping 1051 matching lines @@
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   return !command_line->HasSwitch(extensions::switches::kExtensionProcess);
 }
 
 blink::WebWorkerPermissionClientProxy*
 ChromeContentRendererClient::CreateWorkerPermissionClientProxy(
     content::RenderFrame* render_frame,
     blink::WebFrame* frame) {
   return new WorkerPermissionClientProxy(render_frame, frame);
 }