summaryrefslogtreecommitdiffstats
path: root/chrome_elf/blacklist/blacklist.cc
diff options
context:
space:
mode:
authorcsharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-27 17:15:05 +0000
committercsharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-27 17:15:05 +0000
commite5890e1e8f97eb873972680e85e6c76ea3bc6923 (patch)
treea9cad560057361f14d3506a4d0ce9dc3522b87c7 /chrome_elf/blacklist/blacklist.cc
parent66c12e88d5df69057be30fcd93359ec73bc6362a (diff)
downloadchromium_src-e5890e1e8f97eb873972680e85e6c76ea3bc6923.zip
chromium_src-e5890e1e8f97eb873972680e85e6c76ea3bc6923.tar.gz
chromium_src-e5890e1e8f97eb873972680e85e6c76ea3bc6923.tar.bz2
Link chrome_elf.dll instead of statically linking the blacklist code
This ensure that the dll code is referenced, instead of the target making its own copy. TBR=sky@chromium.org BUG=329023 Review URL: https://codereview.chromium.org/181373003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253847 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_elf/blacklist/blacklist.cc')
-rw-r--r--chrome_elf/blacklist/blacklist.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome_elf/blacklist/blacklist.cc b/chrome_elf/blacklist/blacklist.cc
index 958d710..73383d5 100644
--- a/chrome_elf/blacklist/blacklist.cc
+++ b/chrome_elf/blacklist/blacklist.cc
@@ -8,6 +8,7 @@
#include "base/basictypes.h"
#include "chrome_elf/blacklist/blacklist_interceptions.h"
+#include "chrome_elf/chrome_elf_constants.h"
#include "sandbox/win/src/interception_internal.h"
#include "sandbox/win/src/internal_types.h"
#include "sandbox/win/src/sandbox_utils.h"
@@ -28,10 +29,6 @@ const wchar_t* g_troublesome_dlls[kTroublesomeDllsMaxCount] = {
NULL,
};
-const wchar_t kRegistryBeaconPath[] = L"SOFTWARE\\Google\\Chrome\\BLBeacon";
-const wchar_t kBeaconVersion[] = L"version";
-const wchar_t kBeaconState[] = L"state";
-
} // namespace blacklist
// Allocate storage for thunks in a page of this module to save on doing