Revert of [chrome_elf] Big cleanup and removing dependencies that recently crept in. 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 1c40815b7973f4fe242f5ef5873c9e24eaf2543c..1e399ae83fd335cba82f62c980bfb5f41286c0e1 100644
--- a/chrome_elf/elf_imports_unittest.cc
+++ b/chrome_elf/elf_imports_unittest.cc
@@ -111,9 +111,7 @@
   // 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.
-  // 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"));
+  EXPECT_EQ(nullptr, ::GetModuleHandle(L"user32.dll"));
 
   HMODULE chrome_elf_module_handle = ::LoadLibrary(dll.value().c_str());
   EXPECT_TRUE(chrome_elf_module_handle != nullptr);