diff options
| author | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-13 18:55:25 +0000 |
|---|---|---|
| committer | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-13 18:55:25 +0000 |
| commit | 79ba16881712dc74d764cc8dbbe4e59c73cad754 (patch) | |
| tree | 6e9620ea1e0f9661ae6f2a677020448fe0f6b649 /chrome_elf/blacklist/test | |
| parent | b882b2ee87dc7ba66f10393a9dd92406aee85247 (diff) | |
| download | chromium_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/test')
| -rw-r--r-- | chrome_elf/blacklist/test/blacklist_test.cc | 4 | ||||
| -rw-r--r-- | chrome_elf/blacklist/test/blacklist_test_main_dll.def | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/chrome_elf/blacklist/test/blacklist_test.cc b/chrome_elf/blacklist/test/blacklist_test.cc index 39db737..3a881ad 100644 --- a/chrome_elf/blacklist/test/blacklist_test.cc +++ b/chrome_elf/blacklist/test/blacklist_test.cc @@ -32,7 +32,6 @@ extern "C" { // functions on the test blacklist dll, not the ones linked into the test // executable itself. __declspec(dllimport) bool TestDll_AddDllToBlacklist(const wchar_t* dll_name); -__declspec(dllimport) bool TestDLL_IsBlacklistInitialized(); __declspec(dllimport) bool TestDll_RemoveDllFromBlacklist( const wchar_t* dll_name); } @@ -121,9 +120,6 @@ TEST_F(BlacklistTest, LoadBlacklistedLibrary) { base::FilePath current_dir; ASSERT_TRUE(PathService::Get(base::DIR_EXE, ¤t_dir)); - // Ensure that the blacklist is loaded. - ASSERT_TRUE(TestDLL_IsBlacklistInitialized()); - // Test that an un-blacklisted DLL can load correctly. base::ScopedNativeLibrary dll1(current_dir.Append(kTestDllName1)); EXPECT_TRUE(dll1.is_valid()); diff --git a/chrome_elf/blacklist/test/blacklist_test_main_dll.def b/chrome_elf/blacklist/test/blacklist_test_main_dll.def index 82e0f0e..63522a0 100644 --- a/chrome_elf/blacklist/test/blacklist_test_main_dll.def +++ b/chrome_elf/blacklist/test/blacklist_test_main_dll.def @@ -6,6 +6,5 @@ LIBRARY "blacklist_test_main_dll.dll" EXPORTS TestDll_AddDllToBlacklist=AddDllToBlacklist - TestDLL_IsBlacklistInitialized=IsBlacklistInitialized TestDll_RemoveDllFromBlacklist=RemoveDllFromBlacklist - InitBlacklistTestDll
\ No newline at end of file + InitBlacklistTestDll |