chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc - Issue 815363002: replace COMPILE_ASSERT with static_assert in chrome/browser/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc

Issue 815363002: replace COMPILE_ASSERT with static_assert in chrome/browser/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: address comments Created 6 years 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/extensions/api/content_settings/content_settings_helpers.cc ('k') | chrome/browser/extensions/api/downloads/downloads_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc

diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc

index 4474755441da7ff517553a62bf1ce0a2a15455ce..e096f6d01227955a587a1b20d939f2fcedcb2a1c 100644

--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc

+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc

@@ -644,10 +644,12 @@ TEST_F(WebRequestRulesRegistryTest, GetMatchesDifferentUrls) {

};

// Which rules should match in subsequent test iterations.

const char* const matchingRuleIds[] = { kRuleId1, kRuleId2 };

- COMPILE_ASSERT(arraysize(urls) == arraysize(firstPartyUrls),

- urls_and_firstPartyUrls_need_to_have_the_same_size);

- COMPILE_ASSERT(arraysize(urls) == arraysize(matchingRuleIds),

- urls_and_matchingRuleIds_need_to_have_the_same_size);

+ static_assert(arraysize(urls) == arraysize(firstPartyUrls),

+ "urls and firstPartyUrls must have the same number "

+ "of elements");

+ static_assert(arraysize(urls) == arraysize(matchingRuleIds),

+ "urls and matchingRuleIds must have the same number "

+ "of elements");

net::TestURLRequestContext context;

for (size_t i = 0; i < arraysize(matchingRuleIds); ++i) {