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

Unified Diff: chrome/browser/win/enumerate_modules_model_unittest.cc

Issue 2384413004: [Win] Count number of distinct certificates covering third party modules. (Closed)
Patch Set: Fix initializer lists. Created 4 years, 2 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 | « chrome/browser/win/enumerate_modules_model.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/win/enumerate_modules_model_unittest.cc
diff --git a/chrome/browser/win/enumerate_modules_model_unittest.cc b/chrome/browser/win/enumerate_modules_model_unittest.cc
index d253389328872d9402bed0a7d562335e4ab6930c..d050dea1a398cff51a77ec998987f7b929984ca3 100644
--- a/chrome/browser/win/enumerate_modules_model_unittest.cc
+++ b/chrome/browser/win/enumerate_modules_model_unittest.cc
@@ -32,29 +32,29 @@ static const struct NormalizationEntryList {
{
// Only path normalization needed.
{kType, kStatus, L"c:\\foo\\bar.dll", L"", L"Prod", L"Desc", L"1.0",
- L"Sig", kAction},
+ kAction},
{kType, kStatus, L"c:\\foo\\", L"bar.dll", L"Prod", L"Desc", L"1.0",
- L"Sig", kAction},
+ kAction},
}, {
// Lower case normalization.
{kType, kStatus, L"C:\\Foo\\Bar.dll", L"", L"", L"", L"1.0",
- L"", kAction},
+ kAction},
{kType, kStatus, L"c:\\foo\\", L"bar.dll", L"", L"", L"1.0",
- L"", kAction},
+ kAction},
}, {
// Version can include strings after the version number. Strip that away.
{kType, kStatus, L"c:\\foo.dll", L"", L"", L"", L"1.0 asdf",
- L"", kAction},
+ kAction},
{kType, kStatus, L"c:\\", L"foo.dll", L"", L"", L"1.0",
- L"", kAction},
+ kAction},
}, {
// Corner case: No path (not sure this will ever happen).
- {kType, kStatus, L"bar.dll", L"", L"", L"", L"", L"", kAction},
- {kType, kStatus, L"", L"bar.dll", L"", L"", L"", L"", kAction},
+ {kType, kStatus, L"bar.dll", L"", L"", L"", L"", kAction},
+ {kType, kStatus, L"", L"bar.dll", L"", L"", L"", kAction},
}, {
// Error case: Missing filename (not sure this will ever happen).
- {kType, kStatus, L"", L"", L"", L"", L"1.0", L"", kAction},
- {kType, kStatus, L"", L"", L"", L"", L"1.0", L"", kAction},
+ {kType, kStatus, L"", L"", L"", L"", L"1.0", kAction},
+ {kType, kStatus, L"", L"", L"", L"", L"1.0", kAction},
},
};
@@ -73,20 +73,19 @@ TEST_F(EnumerateModulesTest, NormalizeEntry) {
EXPECT_STREQ(expected.product_name.c_str(), test.product_name.c_str());
EXPECT_STREQ(expected.description.c_str(), test.description.c_str());
EXPECT_STREQ(expected.version.c_str(), test.version.c_str());
- EXPECT_STREQ(expected.digital_signer.c_str(), test.digital_signer.c_str());
EXPECT_EQ(expected.recommended_action, test.recommended_action);
EXPECT_TRUE(test.normalized);
}
}
const ModuleEnumerator::Module kStandardModule =
- { kType, kStatus, L"c:\\foo\\bar.dll", L"", L"Prod", L"Desc", L"1.0", L"Sig",
+ { kType, kStatus, L"c:\\foo\\bar.dll", L"", L"Prod", L"Desc", L"1.0",
ModuleEnumerator::NONE };
const ModuleEnumerator::Module kStandardModuleNoDescription =
- { kType, kStatus, L"c:\\foo\\bar.dll", L"", L"Prod", L"", L"1.0", L"Sig",
+ { kType, kStatus, L"c:\\foo\\bar.dll", L"", L"Prod", L"", L"1.0",
ModuleEnumerator::NONE };
const ModuleEnumerator::Module kStandardModuleNoSignature =
- { kType, kStatus, L"c:\\foo\\bar.dll", L"", L"Prod", L"Desc", L"1.0", L"",
+ { kType, kStatus, L"c:\\foo\\bar.dll", L"", L"Prod", L"Desc", L"1.0",
ModuleEnumerator::NONE };
const struct CollapsePathList {
« no previous file with comments | « chrome/browser/win/enumerate_modules_model.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698