Index: content/renderer/renderer_main.cc |
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc |
index 634684c58fe2fabf8f591cbaf00159ea557d58d0..bd37f34f9695e66442fb3745bda23e725e4de5c4 100644 |
--- a/content/renderer/renderer_main.cc |
+++ b/content/renderer/renderer_main.cc |
@@ -48,6 +48,10 @@ |
#include "third_party/WebKit/public/web/WebView.h" |
#endif // OS_MACOSX |
+#if defined(OS_WIN) |
+#include "chrome_elf/blacklist/blacklist.h" |
+#endif // OS_WIN |
+ |
#if defined(ENABLE_WEBRTC) |
#include "third_party/libjingle/overrides/init_webrtc.h" |
#endif |
@@ -237,6 +241,13 @@ int RendererMain(const MainFunctionParams& parameters) { |
platform.RunSandboxTests(no_sandbox); |
+#if defined(OS_WIN) |
+ // TODO(csharp): Remove once the renderer is no longer getting |
+ // patched this way. |
+ if (blacklist::blacklist_patched) |
robertshield
2014/02/06 18:55:23
I don't believe this will work. blacklist_patched
csharp
2014/02/06 20:03:58
Ah yup. Fixed (and tested to make sure it works).
|
+ UMA_HISTOGRAM_BOOLEAN("Blacklist.PatchedInRenderer", true); |
+#endif |
+ |
startup_timer.Stop(); // End of Startup Time Measurement. |
if (run_loop) { |