Support for recording registered LSPs

chrome/browser/safe_browsing/environment_data_collection_win.h

Index: chrome/browser/safe_browsing/environment_data_collection_win.h
diff --git a/chrome/browser/safe_browsing/environment_data_collection_win.h b/chrome/browser/safe_browsing/environment_data_collection_win.h
index 8dcbcc6e1c6971e5213f2d954149b787fdcc43c5..5e5e85475444453c9609cdf01de044ac1e5c75a8 100644
--- a/chrome/browser/safe_browsing/environment_data_collection_win.h
+++ b/chrome/browser/safe_browsing/environment_data_collection_win.h
@@ -1,14 +1,37 @@
-// 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.
-
-#ifndef CHROME_BROWSER_SAFE_BROWSING_ENVIRONMENT_DATA_COLLECTION_WIN_H_
-#define CHROME_BROWSER_SAFE_BROWSING_ENVIRONMENT_DATA_COLLECTION_WIN_H_
-
-namespace safe_browsing {
-
-// TODO(pmonette): put DLL and LSP collection declarations here.
-
-}  // namespace safe_browsing
-
-#endif  // CHROME_BROWSER_SAFE_BROWSING_ENVIRONMENT_DATA_COLLECTION_WIN_H_
+// 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.
+
+#ifndef CHROME_BROWSER_SAFE_BROWSING_ENVIRONMENT_DATA_COLLECTION_WIN_H_
+#define CHROME_BROWSER_SAFE_BROWSING_ENVIRONMENT_DATA_COLLECTION_WIN_H_
+
+#include <string>
+
+#include "base/strings/string16.h"
+
+namespace safe_browsing {
+
+class ClientIncidentReport_EnvironmentData_Process;
+
+// Collects then populates |process| with the sanitized paths of all DLLs
+// loaded in the current process. Return false if an error occurred while
+// querying for the loaded dlls.
+bool CollectDlls(ClientIncidentReport_EnvironmentData_Process* process);
+
+// For each of the dlls in this already populated incident report,
+// check one of them is a registered LSP.
+void VerifyLSP(ClientIncidentReport_EnvironmentData_Process* process);

[grt (UTC plus 2), 2014/06/10 13:47:54]

how about renaming this to "RecordLspFeatures"?

[pmonette_google.com, 2014/06/10 19:34:39]

Done.

+
+// Helper function for expanding all environment variables in |path|.

[grt (UTC plus 2), 2014/06/10 13:47:53]

move this into the unnamed namespace in the .cc file (and move the #include of
string16 into the .cc file, too).

[pmonette_google.com, 2014/06/10 19:34:39]

Done.

+base::string16 ExpandEnvironmentVariables(const base::string16& path);
+
+// Helper function that insert basic information about a dll into the

[grt (UTC plus 2), 2014/06/10 13:47:53]

i'm not sure that it's worth having this be a public helper. how bad would it be
to inline it in the two places where it's used?

[pmonette_google.com, 2014/06/10 19:34:39]

Sure. I just liked the way my code looked like with this ;)

+// |process| report.
+void AddDll(const std::string& path,
+            int base_address,
+            int length,
+            ClientIncidentReport_EnvironmentData_Process* process);
+
+}  // namespace safe_browsing
+
+#endif  // CHROME_BROWSER_SAFE_BROWSING_ENVIRONMENT_DATA_COLLECTION_WIN_H_