Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(564)

Unified Diff: chrome/browser/chrome_elf_init_unittest_win.cc

Issue 444543002: Add export to query for blacklisted-ness. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add missing include. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chrome_elf_init_win.h » ('j') | chrome_elf/blacklist/blacklist.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_elf_init_unittest_win.cc
diff --git a/chrome/browser/chrome_elf_init_unittest_win.cc b/chrome/browser/chrome_elf_init_unittest_win.cc
index 90a28825d3d2967296cbc57bba4410c6086ae567..c1d629576ff38cb3837e77506d69dac91e504e8a 100644
--- a/chrome/browser/chrome_elf_init_unittest_win.cc
+++ b/chrome/browser/chrome_elf_init_unittest_win.cc
@@ -5,13 +5,17 @@
#include "chrome/browser/chrome_elf_init_win.h"
#include "base/basictypes.h"
+#include "base/files/file_path.h"
#include "base/memory/scoped_ptr.h"
#include "base/metrics/field_trial.h"
+#include "base/path_service.h"
+#include "base/scoped_native_library.h"
#include "base/strings/string16.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/test_reg_util_win.h"
#include "chrome/common/chrome_version_info.h"
+#include "chrome_elf/blacklist/blacklist.h"
#include "chrome_elf/chrome_elf_constants.h"
#include "components/variations/entropy_provider.h"
#include "components/variations/variations_associated_data.h"
@@ -21,6 +25,7 @@
namespace {
const char kBrowserBlacklistTrialEnabledGroupName[] = "Enabled";
+const wchar_t kTestDllName[] = L"blacklist_test_dll_1.dll";
class ChromeBlacklistTrialTest : public testing::Test {
protected:
@@ -195,4 +200,33 @@ TEST_F(ChromeBlacklistTrialTest, AddFinchBlacklistToRegistry) {
}
}
+TEST_F(ChromeBlacklistTrialTest, TestBlacklistBypass) {
+ base::FilePath current_dir;
+ ASSERT_TRUE(PathService::Get(base::DIR_EXE, &current_dir));
+
+ // Load test dll.
+ base::ScopedNativeLibrary dll1(current_dir.Append(kTestDllName));
+
+ // No blacklisted dll should be found.
+ std::vector<base::string16> module_names;
+ EXPECT_TRUE(GetLoadedBlacklistedModules(&module_names));
+ EXPECT_TRUE(module_names.empty());
+ // For posterity, print any that are.
+ std::vector<base::string16>::const_iterator module_iter(module_names.begin());
+ for (; module_iter != module_names.end(); ++module_iter) {
+ LOG(ERROR) << "Found blacklisted module: " << *module_iter;
+ }
+
+ // Add test dll to blacklist
+ blacklist::AddDllToBlacklist(kTestDllName);
+
+ // Check that the test dll appears in list.
+ module_names.clear();
+ EXPECT_TRUE(GetLoadedBlacklistedModules(&module_names));
+ ASSERT_EQ(1, module_names.size());
+ EXPECT_STREQ(kTestDllName,
+ StringToLowerASCII(
+ base::FilePath(module_names[0]).BaseName().value()).c_str());
+}
+
} // namespace
« no previous file with comments | « no previous file | chrome/browser/chrome_elf_init_win.h » ('j') | chrome_elf/blacklist/blacklist.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698