[chrome_elf] Big ELF cleanup. Part 1.

chrome_elf/elf_imports_unittest.cc

Index: chrome_elf/elf_imports_unittest.cc
diff --git a/chrome_elf/elf_imports_unittest.cc b/chrome_elf/elf_imports_unittest.cc
index e466c9b4ac36aa5835ddf63404e38b10b182d6e3..96e078c96caa02ab11a14efe1440e4577a36d280 100644
--- a/chrome_elf/elf_imports_unittest.cc
+++ b/chrome_elf/elf_imports_unittest.cc
@@ -144,7 +144,9 @@ TEST_F(ELFImportsTest, DISABLED_ChromeElfLoadSanityTestImpl) {
   // We don't expect user32 to be loaded in chrome_elf_unittests. If this test
   // case fails, then it means that a dependency on user32 has crept into the
   // chrome_elf_unittests executable, which needs to be removed.
-  EXPECT_EQ(nullptr, ::GetModuleHandle(L"user32.dll"));
+  // NOTE: it may be a secondary dependency of another system DLL.  If so,
+  // try adding a "/DELAYLOAD:<blah>.dll" to the build.gn file.
+  ASSERT_EQ(nullptr, ::GetModuleHandle(L"user32.dll"));
 
   HMODULE chrome_elf_module_handle = ::LoadLibrary(dll.value().c_str());
   EXPECT_TRUE(chrome_elf_module_handle != nullptr);