Reland of http://crrev.com/241548.

chrome_elf/chrome_elf.gyp

Index: chrome_elf/chrome_elf.gyp
diff --git a/chrome_elf/chrome_elf.gyp b/chrome_elf/chrome_elf.gyp
index cf0a0e95d68545d1c6217b621d3cd3f0a39ec1c5..7227fe6413ce758b82a6455fcdeba03776ec3392 100644
--- a/chrome_elf/chrome_elf.gyp
+++ b/chrome_elf/chrome_elf.gyp
@@ -8,6 +8,7 @@
   'includes': [
     '../build/win_precompile.gypi',
     '../chrome/version.gypi',
+    'blacklist.gypi',
   ],
   'targets': [
     {
@@ -22,6 +23,7 @@
         'chrome_elf_main.h',
       ],
       'dependencies': [
+        'blacklist',
         'chrome_elf_lib',
       ],
       'msvs_settings': {
@@ -29,6 +31,12 @@
           'BaseAddress': '0x01c20000',
           # Set /SUBSYSTEM:WINDOWS for chrome_elf.dll (for consistency).
           'SubSystem': '2',
+          'AdditionalDependencies!': [
+            'user32.lib',
+          ],
+          'IgnoreDefaultLibraryNames': [
+            'user32.lib',
+          ],
         },
       },
     },
@@ -36,6 +44,7 @@
       'target_name': 'chrome_elf_unittests',
       'type': 'executable',
       'sources': [
+        'blacklist/test/blacklist_test.cc',
         'ntdll_cache_unittest.cc',
       ],
       'include_dirs': [
@@ -43,8 +52,16 @@
       ],
       'dependencies': [
         'chrome_elf_lib',
-        '<(DEPTH)/base/base.gyp:run_all_unittests',
-        '<(DEPTH)/testing/gtest.gyp:gtest',
+        '../base/base.gyp:base',
+        '../base/base.gyp:run_all_unittests',
+        '../base/base.gyp:test_support_base',
+        '../sandbox/sandbox.gyp:sandbox',
+        '../testing/gtest.gyp:gtest',
+        'blacklist',
+        'blacklist_test_dll_1',
+        'blacklist_test_dll_2',
+        'blacklist_test_dll_3',
+        'blacklist_test_main_dll',
       ],
     },
     {