Add UMA stats to record when DLLs are successfully blocked in the Browser.

chrome_elf/blacklist/blacklist.h

 // 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.
 
 #ifndef CHROME_ELF_BLACKLIST_BLACKLIST_H_
 #define CHROME_ELF_BLACKLIST_BLACKLIST_H_
 
 #if defined(_WIN64)
 #include "sandbox/win/src/sandbox_nt_types.h"
 #endif
 
 namespace blacklist {
 
 // Max size of the DLL blacklist.
-const int kTroublesomeDllsMaxCount = 64;
+const size_t kTroublesomeDllsMaxCount = 64;
 
 // The DLL blacklist.
 extern const wchar_t* g_troublesome_dlls[kTroublesomeDllsMaxCount];
 
 // The registry path of the blacklist beacon.
 extern const wchar_t kRegistryBeaconPath[];
 
 // The properties for the blacklist beacon.
 extern const wchar_t kBeaconVersion[];
 extern const wchar_t kBeaconState[];
@@ skipping 35 matching lines @@
 // Return the size of the current blacklist.
 int BlacklistSize();
 
 // Returns if true if the blacklist has been initialized.
 extern "C" bool IsBlacklistInitialized();
 
 // Adds the given dll name to the blacklist. Returns true if the dll name is in
 // the blacklist when this returns, false on error. Note that this will copy
 // |dll_name| and will leak it on exit if the string is not subsequently removed
 // using RemoveDllFromBlacklist.
+// Exposed for testing only, this shouldn't be exported from chrome_elf.dll.
 extern "C" bool AddDllToBlacklist(const wchar_t* dll_name);
 
 // Removes the given dll name from the blacklist. Returns true if it was
 // removed, false on error.
+// Exposed for testing only, this shouldn't be exported from chrome_elf.dll.
 extern "C" bool RemoveDllFromBlacklist(const wchar_t* dll_name);
 
+// Returns a list of all the dlls that have been successfully blocked by the
+// blacklist via blocked_dlls, if there is enough space (according to |size|).
+// |size| will always be modified to be the number of dlls that were blocked.
+// The caller doesn't own the strings and isn't expected to free them. These
+// strings won't be hanging unless RemoveDllFromBlacklist is called, but it
+// is only exposed in tests (and should stay that way).
+extern "C" void SuccessfullyBlocked(const wchar_t** blocked_dlls, int* size);

[sky, 2014/02/26 21:52:05]

Is there a reason this can't return std::vector<std::wstring> ? Seems like a
such a return type would be much more type safe.

[csharp, 2014/02/26 22:00:01]

This is usually called from across a dll boundary and I don't believe we can
easily or consistently pass c++ types.

+
+// Record that the dll at the given index was blocked.
+void BlockedDll(size_t blocked_index);
+
 // Initializes the DLL blacklist in the current process. This should be called
 // before any undesirable DLLs might be loaded. If |force| is set to true, then
 // initialization will take place even if a beacon is present. This is useful
 // for tests.
 bool Initialize(bool force);
 
 }  // namespace blacklist
 
 #endif  // CHROME_ELF_BLACKLIST_BLACKLIST_H_