Add module name to module_list to aid debugging.

chrome/browser/install_verification/win/module_list.cc

 // Copyright 2013 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 "chrome/browser/install_verification/win/module_list.h"
 
 #include <Psapi.h>
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "chrome/browser/install_verification/win/module_info.h"
 
-namespace {
-
-void CheckFreeLibrary(HMODULE module) {
-  BOOL result = ::FreeLibrary(module);
-  DCHECK(result);
-}
-
-}  // namespace
-
 ModuleList::~ModuleList() {
-  std::for_each(modules_.begin(), modules_.end(), &CheckFreeLibrary);
+  for (const auto& module : modules_) {
+    BOOL result = ::FreeLibrary(std::get<HMODULE>(module));
+    DCHECK(result) << std::get<std::wstring>(module);
+  }
 }
 
 scoped_ptr<ModuleList> ModuleList::FromLoadedModuleSnapshot(
     const std::vector<HMODULE>& snapshot) {
   scoped_ptr<ModuleList> instance(new ModuleList);
 
+  wchar_t module_name[MAX_PATH] = {0};

[robertshield, 2016/04/19 00:54:23]

nit: {}

+
   for (size_t i = 0; i < snapshot.size(); ++i) {
     HMODULE module = NULL;
     // ::GetModuleHandleEx add-ref's the module if successful.
     if (::GetModuleHandleEx(
             GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS,
             reinterpret_cast<LPCWSTR>(snapshot[i]),
             &module)) {
-        instance->modules_.push_back(module);
+      if (::GetModuleFileNameW(module, module_name, MAX_PATH)) {
+        instance->modules_.push_back(std::make_tuple(module, module_name));
+      } else {
+        instance->modules_.push_back(std::make_tuple(module, std::wstring()));
+      }
     }
   }
 
   return instance;
 }
 
 void ModuleList::GetModuleInfoSet(std::set<ModuleInfo>* module_info_set) {
   HANDLE current_process = ::GetCurrentProcess();
   for (size_t i = 0; i < modules_.size(); ++i) {
     wchar_t filename[MAX_PATH];

[robertshield, 2016/04/19 00:54:23]

looks like this should have an = {} on the end?

     // Simply ignore modules where GetModuleFileName or GetModuleInformation
     // failed, they might have been unloaded.
-    if (::GetModuleFileName(modules_[i], filename, MAX_PATH) &&
+    if (::GetModuleFileName(std::get<HMODULE>(modules_[i]), filename,
+                            MAX_PATH) &&

[robertshield, 2016/04/19 00:54:22]

Many of the entries in modules_ will already have the filename populated. Can we
skip retrieving the filename again if the modules_ entry already contains it?

[Will Harris, 2016/04/19 00:59:05]

yes I found that later, I think I should change how I do this.

turns out the fact we can't close guard64.dll doesn't have any material impact
on the bug anyway. I might chuck this CL, unless you think strongly that it's
worth it.

         filename[0]) {
       MODULEINFO sys_module_info = {};
-      if (::GetModuleInformation(
-              current_process, modules_[i],
-              &sys_module_info, sizeof(sys_module_info))) {
+      if (::GetModuleInformation(current_process,
+                                 std::get<HMODULE>(modules_[i]),
+                                 &sys_module_info, sizeof(sys_module_info))) {
         module_info_set->insert(ModuleInfo(
             filename,
             reinterpret_cast<uintptr_t>(sys_module_info.lpBaseOfDll),
             sys_module_info.SizeOfImage));
       }
     }
   }
 }
 
 ModuleList::ModuleList() {}