summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcsharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-25 21:13:01 +0000
committercsharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-25 21:13:01 +0000
commit6e72aaf9b75d47871c679ed4c7db2e0a89d19678 (patch)
tree0e5f7e1f7a70c6cbd9ce928680a2eb0ebb022a17
parent0b5ec8bfb0abfa75ea29687e4def27af7fc270bd (diff)
downloadchromium_src-6e72aaf9b75d47871c679ed4c7db2e0a89d19678.zip
chromium_src-6e72aaf9b75d47871c679ed4c7db2e0a89d19678.tar.gz
chromium_src-6e72aaf9b75d47871c679ed4c7db2e0a89d19678.tar.bz2
Update DllHash to include recently blacklisted dlls
BUG= Review URL: https://codereview.chromium.org/353873002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279814 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome_elf/blacklist/blacklist.cc2
-rw-r--r--tools/metrics/histograms/histograms.xml7
2 files changed, 9 insertions, 0 deletions
diff --git a/chrome_elf/blacklist/blacklist.cc b/chrome_elf/blacklist/blacklist.cc
index efb9c97..46f06975 100644
--- a/chrome_elf/blacklist/blacklist.cc
+++ b/chrome_elf/blacklist/blacklist.cc
@@ -29,6 +29,8 @@ namespace blacklist{
// For more information about how this list is generated, and how to get off
// of it, see:
// https://sites.google.com/a/chromium.org/dev/Home/third-party-developers
+// NOTE: Please remember to update the DllHash enum in histograms.xml when
+// adding a new value to the blacklist.
const wchar_t* g_troublesome_dlls[kTroublesomeDllsMaxCount] = {
L"activedetect32.dll", // Lenovo One Key Theater.
// See crbug.com/379218.
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index d1c6bde..ff7cff0 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -35907,9 +35907,16 @@ Therefore, the affected-histogram name has to have at least one dot in it.
<enum name="DllHash" type="int">
<!-- Generated by chrome_elf/dll_hash_for_uma/dll_hash_for_uma_main.cc -->
+ <int value="272828651" label="activedetect64.dll"/>
+ <int value="750761702" label="systemk.dll"/>
+ <int value="777975221" label="activedetect32.dll"/>
<int value="803283353" label="lmrn.dll"/>
<int value="989714890" label="datamngr.dll"/>
+ <int value="1120295191" label="windowsapihookdll64.dll"/>
+ <int value="1148809156" label="chrmxtn.dll"/>
<int value="1270622879" label="hk.dll"/>
+ <int value="1409376135" label="windowsapihookdll32.dll"/>
+ <int value="1736709911" label="bitguard.dll"/>
<int value="2132270559" label="libsvn_tsvn32.dll"/>
</enum>