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

Unified Diff: components/certificate_transparency/ct_policy_manager_unittest.cc

Issue 2714053003: Fix GCC build for target 'all' (Closed)
Patch Set: Remove auto Created 3 years, 10 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
Index: components/certificate_transparency/ct_policy_manager_unittest.cc
diff --git a/components/certificate_transparency/ct_policy_manager_unittest.cc b/components/certificate_transparency/ct_policy_manager_unittest.cc
index 51fe6dbf728831740b1ec6c90507ed2271d35ee4..6081739f2eae47258bc6c1352aef93005b473c93 100644
--- a/components/certificate_transparency/ct_policy_manager_unittest.cc
+++ b/components/certificate_transparency/ct_policy_manager_unittest.cc
@@ -20,8 +20,7 @@ namespace certificate_transparency {
namespace {
-template <size_t N>
-base::ListValue* ListValueFromStrings(const char* const (&strings)[N]) {
+base::ListValue* ListValueFromStrings(const std::vector<const char*>& strings) {
std::unique_ptr<base::ListValue> result(new base::ListValue);
for (const auto& str : strings) {
result->AppendString(str);
@@ -67,8 +66,9 @@ TEST_F(CTPolicyManagerTest, DelegateChecksRequired) {
// Now set a preference, pump the message loop, and ensure things are now
// reflected.
- pref_service_.SetManagedPref(prefs::kCTRequiredHosts,
- ListValueFromStrings({"google.com"}));
+ pref_service_.SetManagedPref(
+ prefs::kCTRequiredHosts,
+ ListValueFromStrings(std::vector<const char*>{"google.com"}));
base::RunLoop().RunUntilIdle();
// The new preferences should take effect.
@@ -94,8 +94,9 @@ TEST_F(CTPolicyManagerTest, DelegateChecksExcluded) {
// Now set a preference, pump the message loop, and ensure things are now
// reflected.
- pref_service_.SetManagedPref(prefs::kCTExcludedHosts,
- ListValueFromStrings({"google.com"}));
+ pref_service_.SetManagedPref(
+ prefs::kCTExcludedHosts,
+ ListValueFromStrings(std::vector<const char*>{"google.com"}));
base::RunLoop().RunUntilIdle();
// The new preferences should take effect.
@@ -123,7 +124,7 @@ TEST_F(CTPolicyManagerTest, IgnoresInvalidEntries) {
// URLs).
pref_service_.SetManagedPref(
prefs::kCTRequiredHosts,
- ListValueFromStrings({
+ ListValueFromStrings(std::vector<const char*>{
"file:///etc/fstab", "file://withahost/etc/fstab",
"file:///c|/Windows", "*", "https://*", "example.com",
"https://example.test:invalid_port",
@@ -180,12 +181,13 @@ TEST_F(CTPolicyManagerTest, AppliesPriority) {
// but then require it for a specific host.
pref_service_.SetManagedPref(
prefs::kCTExcludedHosts,
- ListValueFromStrings({"example.com", ".sub.example.com",
- ".sub.accounts.example.com", "test.example.com"}));
+ ListValueFromStrings(std::vector<const char*>{
+ "example.com", ".sub.example.com", ".sub.accounts.example.com",
+ "test.example.com"}));
pref_service_.SetManagedPref(
prefs::kCTRequiredHosts,
- ListValueFromStrings(
- {"sub.example.com", "accounts.example.com", "test.example.com"}));
+ ListValueFromStrings(std::vector<const char*>{
+ "sub.example.com", "accounts.example.com", "test.example.com"}));
base::RunLoop().RunUntilIdle();
EXPECT_EQ(CTRequirementLevel::NOT_REQUIRED,
@@ -231,8 +233,9 @@ TEST_F(CTPolicyManagerTest, UsableAfterShutdown) {
// Now set a preference, pump the message loop, and ensure things are now
// reflected.
- pref_service_.SetManagedPref(prefs::kCTRequiredHosts,
- ListValueFromStrings({"google.com"}));
+ pref_service_.SetManagedPref(
+ prefs::kCTRequiredHosts,
+ ListValueFromStrings(std::vector<const char*>{"google.com"}));
base::RunLoop().RunUntilIdle();
// The new preferences should take effect.
@@ -251,8 +254,9 @@ TEST_F(CTPolicyManagerTest, UsableAfterShutdown) {
delegate->IsCTRequiredForHost("example.com"));
EXPECT_EQ(CTRequirementLevel::DEFAULT,
delegate->IsCTRequiredForHost("sub.example.com"));
- pref_service_.SetManagedPref(prefs::kCTRequiredHosts,
- ListValueFromStrings({"sub.example.com"}));
+ pref_service_.SetManagedPref(
+ prefs::kCTRequiredHosts,
+ ListValueFromStrings(std::vector<const char*>{"sub.example.com"}));
base::RunLoop().RunUntilIdle();
EXPECT_EQ(CTRequirementLevel::REQUIRED,
delegate->IsCTRequiredForHost("google.com"));

Powered by Google App Engine
This is Rietveld 408576698