Add export to query for blacklisted-ness.

chrome/browser/chrome_elf_init_win.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 "base/bind.h"
+#include "base/files/file_path.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "chrome/browser/chrome_elf_init_win.h"
+#include "chrome/browser/install_verification/win/module_info.h"
+#include "chrome/browser/install_verification/win/module_verification_common.h"
 #include "chrome_elf/blacklist/blacklist.h"
 #include "chrome_elf/chrome_elf_constants.h"
 #include "chrome_elf/dll_hash/dll_hash.h"
 #include "components/variations/variations_associated_data.h"
 #include "content/public/browser/browser_thread.h"
 #include "version.h"  // NOLINT
 
 const char kBrowserBlacklistTrialName[] = "BrowserBlacklist";
 const char kBrowserBlacklistTrialDisabledGroupName[] = "NoBlacklist";
 
@@ skipping 175 matching lines @@
 
     blacklist_registry_key.WriteValue(blacklist::kBeaconAttemptCount,
                                       static_cast<DWORD>(0));
 
     // Only report the blacklist as getting setup when both registry writes
     // succeed, since otherwise the blacklist wasn't properly setup.
     if (set_version == ERROR_SUCCESS && set_state == ERROR_SUCCESS)
       RecordBlacklistSetupEvent(BLACKLIST_SETUP_ENABLED);
   }
 }
+
+bool RetrieveBlacklistedModules(std::vector<base::string16>* module_names) {

[csharp, 2014/08/05 21:08:59]

std::vector<base::string16>* -> const std::vector<const base::string16>*

[robertshield, 2014/08/06 16:38:32]

As discussed, this is an out param and there's not much value in enforcing that
the return strings be themselves const.

+  DCHECK(module_names);
+
+  bool module_found = false;
+  std::set<ModuleInfo> module_info;
+  if (GetLoadedModules(&module_info)) {

[csharp, 2014/08/05 21:08:59]

Maybe have "if (!GetLoadedModules(&module_info)) return false" instead (less
indentation later and a clearer exit condition)

[robertshield, 2014/08/06 16:38:32]

Done.

+    std::set<ModuleInfo>::const_iterator module_iter(module_info.begin());
+    for (; module_iter != module_info.end(); ++module_iter) {
+      base::string16 module_file_name(StringToLowerASCII(
+          base::FilePath(module_iter->name).BaseName().value()));
+      int blacklist_index =
+          blacklist::GetBlacklistIndex(module_file_name.c_str());

[csharp, 2014/08/05 21:08:59]

Maybe just move this directly into the if statement since the variable is only
used once

[robertshield, 2014/08/06 16:38:32]

Done.

+      if (blacklist_index > -1) {

[csharp, 2014/08/05 21:08:59]

why > and not !=?

[robertshield, 2014/08/06 16:38:32]

Done.

+        module_names->push_back(module_iter->name);
+        module_found = true;
+      }
+    }
+  }
+
+  return module_found;
+}