The incident reporting service now calls VerifyModule.

chrome/browser/safe_browsing/module_integrity_verifier_win.h

Index: chrome/browser/safe_browsing/module_integrity_verifier_win.h
diff --git a/chrome/browser/safe_browsing/module_integrity_verifier_win.h b/chrome/browser/safe_browsing/module_integrity_verifier_win.h
index 2cc2ad18ad6308b7a3914069fd711fdbb547e8ff..b6996d2dfbebb60efd93a67162c2fb319bc39413 100644
--- a/chrome/browser/safe_browsing/module_integrity_verifier_win.h
+++ b/chrome/browser/safe_browsing/module_integrity_verifier_win.h
@@ -18,6 +18,29 @@ class PEImageAsData;
 
 namespace safe_browsing {
 
+// The max number of test dlls in |test_dll_names|.

[csharp, 2014/08/05 15:46:33]

Lines 21->33 seem to be just for tests, can they be moved to a test file?

[grt (UTC plus 2), 2014/08/05 16:04:54]

yes, please move as much of this as possible into the _unittest.cc file(s) or a
module_integrity_unittest_util file(s) or something.

[krstnmnlsn, 2014/08/05 23:07:25]

Okay cool.  _util made.

+const int kTestDllsMaxCount = 5;

[grt (UTC plus 2), 2014/08/05 16:04:54]

i think this can be safely removed. there are ways to make the test not need a
value like this at compile time

[krstnmnlsn, 2014/08/05 23:07:25]

Done.

+
+// The test dlls used by module_integrity_verifier_win_unittest.cc and
+// environment_data_collection_win_unittest.cc.  The tests assume there exists
+// at least one entry.
+const wchar_t* test_dll_names[];
+
+// Returns the number of names in |test_dll_names|.
+int TestDllsCount();
+
+// A function exported by the test dlls in |test_dll_names|.
+const char kTestExportName[] = "DummyExport";
+
+// The max number of modules in |modules_to_verify|.
+const int kModulesToVerifyMaxCount = 5;
+
+// The modules on which we will run VerifyModule.
+const wchar_t* modules_to_verify[];
+
+// Returns the number of names in |modules_to_verify|.
+int ModulesToVerifyCount();
+
 // This enum defines the possible module states VerifyModule can return.
 enum ModuleState {
   MODULE_STATE_UNKNOWN,