summaryrefslogtreecommitdiffstats
path: root/chrome_elf/blacklist/blacklist.cc
diff options
context:
space:
mode:
authorasvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-13 18:55:25 +0000
committerasvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-13 18:55:25 +0000
commit79ba16881712dc74d764cc8dbbe4e59c73cad754 (patch)
tree6e9620ea1e0f9661ae6f2a677020448fe0f6b649 /chrome_elf/blacklist/blacklist.cc
parentb882b2ee87dc7ba66f10393a9dd92406aee85247 (diff)
downloadchromium_src-79ba16881712dc74d764cc8dbbe4e59c73cad754.zip
chromium_src-79ba16881712dc74d764cc8dbbe4e59c73cad754.tar.gz
chromium_src-79ba16881712dc74d764cc8dbbe4e59c73cad754.tar.bz2
Revert 250828 "Add a UMA stat to track if the Browser blacklist ..."
Speculative revert for failures here: http://build.chromium.org/p/chromium.win/builders/Win7%20Sync%20x64/builds/11201 > Add a UMA stat to track if the Browser blacklist is Set on the Renderer > > This shouldn't be happening, but we got some crash reports suggesting it > does. Unable to repo locally so this stat will verify it does occur and > then can be used to verify our fixes actually fix it. > > BUG=329023 > > Review URL: https://codereview.chromium.org/140763008 TBR=csharp@chromium.org Review URL: https://codereview.chromium.org/163633005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251095 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_elf/blacklist/blacklist.cc')
-rw-r--r--chrome_elf/blacklist/blacklist.cc11
1 files changed, 0 insertions, 11 deletions
diff --git a/chrome_elf/blacklist/blacklist.cc b/chrome_elf/blacklist/blacklist.cc
index 32d3cb2..ea140c4 100644
--- a/chrome_elf/blacklist/blacklist.cc
+++ b/chrome_elf/blacklist/blacklist.cc
@@ -60,10 +60,6 @@ enum WOW64Status {
WOW64_UNKNOWN,
};
-// Record if the blacklist was successfully initialized so processes can easily
-// determine if the blacklist is enabled for them.
-bool g_blacklist_initialized = false;
-
WOW64Status GetWOW64StatusForCurrentProcess() {
typedef BOOL (WINAPI* IsWow64ProcessFunc)(HANDLE, PBOOL);
IsWow64ProcessFunc is_wow64_process = reinterpret_cast<IsWow64ProcessFunc>(
@@ -276,10 +272,6 @@ int BlacklistSize() {
return size;
}
-bool IsBlacklistInitialized() {
- return g_blacklist_initialized;
-}
-
bool AddDllToBlacklist(const wchar_t* dll_name) {
int blacklist_size = BlacklistSize();
// We need to leave one space at the end for the null pointer.
@@ -381,9 +373,6 @@ bool Initialize(bool force) {
}
#endif
- // Record that we have initialized the blacklist.
- g_blacklist_initialized = true;
-
BYTE* thunk_storage = reinterpret_cast<BYTE*>(&g_thunk_storage);
// Mark the thunk storage as readable and writeable, since we