Revert of [chrome_elf] Big cleanup and removing dependencies that recently crept in. Part 1.

chrome_elf/elf_imports_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdint.h>
 #include <windows.h>
 
 #include <algorithm>
 #include <vector>
 
@@ skipping 93 matching lines @@
   }
 }
 TEST_F(ELFImportsTest, ChromeElfLoadSanityTest) {
   base::FilePath dll;
   ASSERT_TRUE(PathService::Get(base::DIR_EXE, &dll));
   dll = dll.Append(L"chrome_elf.dll");
 
   // 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);
   // Loading chrome_elf.dll should not load user32.dll
   EXPECT_EQ(nullptr, ::GetModuleHandle(L"user32.dll"));
   EXPECT_TRUE(!!::FreeLibrary(chrome_elf_module_handle));
 }
 #endif  // NDEBUG
 
 TEST_F(ELFImportsTest, ChromeExeSanityCheck) {
   std::vector<std::string> exe_imports;
 
   base::FilePath exe;
   ASSERT_TRUE(PathService::Get(base::DIR_EXE, &exe));
   exe = exe.Append(L"chrome.exe");
   GetImports(exe, &exe_imports);
 
   // Check that chrome.exe has imports.
   ASSERT_LT(0u, exe_imports.size()) << "Ensure the chrome_elf_unittests "
     "target was built, instead of chrome_elf_unittests.exe";
 
   // Chrome.exe's first import must be ELF.
   EXPECT_EQ("chrome_elf.dll", exe_imports[0]) <<
       "Illegal import order in chrome.exe (ensure the chrome_elf_unittest "
       "target was built, instead of just chrome_elf_unittests.exe)";
 }
 
 }  // namespace