diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser_tests.isolate | 1 | ||||
| -rw-r--r-- | chrome/chrome_renderer.gypi | 3 | ||||
| -rw-r--r-- | chrome/interactive_ui_tests.isolate | 1 | ||||
| -rw-r--r-- | chrome/renderer/DEPS | 1 | ||||
| -rw-r--r-- | chrome/renderer/chrome_content_renderer_client.cc | 17 | ||||
| -rw-r--r-- | chrome/unit_tests.isolate | 1 |
6 files changed, 24 insertions, 0 deletions
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate index 55aadf4..a7d03c1 100644 --- a/chrome/browser_tests.isolate +++ b/chrome/browser_tests.isolate @@ -132,6 +132,7 @@ 'variables': { 'isolate_dependency_tracked': [ '../native_client/build/build_nexe.py', + '<(PRODUCT_DIR)/chrome_elf.dll', '<(PRODUCT_DIR)/clearkeycdm.dll', '<(PRODUCT_DIR)/clearkeycdmadapter.dll', '<(PRODUCT_DIR)/ppapi_tests.dll', diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi index b546cd6..c1444cc 100644 --- a/chrome/chrome_renderer.gypi +++ b/chrome/chrome_renderer.gypi @@ -441,6 +441,9 @@ ], }], ['OS=="win"', { + 'dependencies': [ + '../chrome_elf/chrome_elf.gyp:chrome_elf', + ], 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', ], diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate index fa70b9b..4738ceb 100644 --- a/chrome/interactive_ui_tests.isolate +++ b/chrome/interactive_ui_tests.isolate @@ -77,6 +77,7 @@ 'isolate_dependency_tracked': [ '../net/data/ssl/certificates/foaf.me.chromium-test-cert.der', '../net/data/ssl/certificates/mit.davidben.der', + '<(PRODUCT_DIR)/chrome_elf.dll', '<(PRODUCT_DIR)/d3dcompiler_46.dll', '<(PRODUCT_DIR)/ffmpegsumo.dll', '<(PRODUCT_DIR)/libEGL.dll', diff --git a/chrome/renderer/DEPS b/chrome/renderer/DEPS index 14a782f..bf9a831f 100644 --- a/chrome/renderer/DEPS +++ b/chrome/renderer/DEPS @@ -1,4 +1,5 @@ include_rules = [ + "+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 9318da9..45a5afe 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -116,6 +116,10 @@ #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; @@ -353,6 +357,19 @@ void ChromeContentRendererClient::RenderThreadStarted() { 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 && is_blacklist_initialized()) + UMA_HISTOGRAM_BOOLEAN("Blacklist.PatchedInRenderer", true); +#endif } void ChromeContentRendererClient::RenderFrameCreated( diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate index 0096f1f..ce28077 100644 --- a/chrome/unit_tests.isolate +++ b/chrome/unit_tests.isolate @@ -108,6 +108,7 @@ ['OS=="win"', { 'variables': { 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/chrome_elf.dll', '<(PRODUCT_DIR)/ffmpegsumo.dll', ], 'isolate_dependency_untracked': [ |