diff options
| author | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-13 21:39:37 +0000 |
|---|---|---|
| committer | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-13 21:39:37 +0000 |
| commit | 47b779fca8a5b22ec61e2469d14c33c9cd5bf86c (patch) | |
| tree | a4e74de3b8f947c49c7a937bbd2acb14ea64677e /chrome_elf/blacklist/test | |
| parent | 951a7e9c7844f5bd019960e19a08522d258975b6 (diff) | |
| download | chromium_src-47b779fca8a5b22ec61e2469d14c33c9cd5bf86c.zip chromium_src-47b779fca8a5b22ec61e2469d14c33c9cd5bf86c.tar.gz chromium_src-47b779fca8a5b22ec61e2469d14c33c9cd5bf86c.tar.bz2 | |
Revert 251095 "Revert 250828 "Add a UMA stat to track if the Bro..."
Speculative re-land to see if this causes sync tests failures again.
If it does, then we will know if this is the cause.
> 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
TBR=asvitkine@chromium.org
Review URL: https://codereview.chromium.org/164833002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251134 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, 6 insertions, 1 deletions
diff --git a/chrome_elf/blacklist/test/blacklist_test.cc b/chrome_elf/blacklist/test/blacklist_test.cc index 3a881ad..39db737 100644 --- a/chrome_elf/blacklist/test/blacklist_test.cc +++ b/chrome_elf/blacklist/test/blacklist_test.cc @@ -32,6 +32,7 @@ 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); } @@ -120,6 +121,9 @@ 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 63522a0..82e0f0e 100644 --- a/chrome_elf/blacklist/test/blacklist_test_main_dll.def +++ b/chrome_elf/blacklist/test/blacklist_test_main_dll.def @@ -6,5 +6,6 @@ LIBRARY "blacklist_test_main_dll.dll" EXPORTS TestDll_AddDllToBlacklist=AddDllToBlacklist + TestDLL_IsBlacklistInitialized=IsBlacklistInitialized TestDll_RemoveDllFromBlacklist=RemoveDllFromBlacklist - InitBlacklistTestDll + InitBlacklistTestDll
\ No newline at end of file |