replace COMPILE_ASSERT with static_assert in chrome/common/

BUG=442514

Review URL: https://codereview.chromium.org/812503003

Cr-Commit-Position: refs/heads/master@{#309974}

2 files changed, 23 insertions, 19 deletions

diff --git a/chrome/common/mac/launchd.mm b/chrome/common/mac/launchd.mm
index fb5da92..0990fa4 100644
--- a/chrome/common/mac/launchd.mm
+++ b/chrome/common/mac/launchd.mm
@@ -56,18 +56,18 @@ NSURL* GetPlistURL(Launchd::Domain domain,
 
 }  // namespace
 
-COMPILE_ASSERT(static_cast<int>(Launchd::User) ==
-               static_cast<int>(NSUserDomainMask),
-               NSUserDomainMask_value_changed);
-COMPILE_ASSERT(static_cast<int>(Launchd::Local) ==
-               static_cast<int>(NSLocalDomainMask),
-               NSLocalDomainMask_value_changed);
-COMPILE_ASSERT(static_cast<int>(Launchd::Network) ==
-               static_cast<int>(NSNetworkDomainMask),
-               NSNetworkDomainMask_value_changed);
-COMPILE_ASSERT(static_cast<int>(Launchd::System) ==
-               static_cast<int>(NSSystemDomainMask),
-               NSSystemDomainMask_value_changed);
+static_assert(static_cast<int>(Launchd::User) ==
+              static_cast<int>(NSUserDomainMask),
+              "NSUserDomainMask value changed");
+static_assert(static_cast<int>(Launchd::Local) ==
+              static_cast<int>(NSLocalDomainMask),
+              "NSLocalDomainMask value changed");
+static_assert(static_cast<int>(Launchd::Network) ==
+              static_cast<int>(NSNetworkDomainMask),
+              "NSNetworkDomainMask value changed");
+static_assert(static_cast<int>(Launchd::System) ==
+              static_cast<int>(NSSystemDomainMask),
+              "NSSystemDomainMask value changed");
 
 Launchd* Launchd::g_instance_ = NULL;
 
diff --git a/chrome/common/mac/mock_launchd.cc b/chrome/common/mac/mock_launchd.cc
index 237e3ed..e463733 100644
--- a/chrome/common/mac/mock_launchd.cc
+++ b/chrome/common/mac/mock_launchd.cc
@@ -129,7 +129,8 @@ CFDictionaryRef MockLaunchd::CopyExports() {
       kCFAllocatorDefault, pipe_name_.c_str(), kCFStringEncodingUTF8));
   const void *keys[] = { env_var };
   const void *values[] = { socket_path };
-  COMPILE_ASSERT(arraysize(keys) == arraysize(values), array_sizes_must_match);
+  static_assert(arraysize(keys) == arraysize(values),
+                "keys must have the same number of elements as values");
   return CFDictionaryCreate(kCFAllocatorDefault,
                             keys,
                             values,
@@ -155,7 +156,8 @@ CFDictionaryRef MockLaunchd::CopyJobDictionary(CFStringRef label) {
   base::ScopedCFTypeRef<CFNumberRef> pid(
       CFNumberCreate(NULL, kCFNumberIntType, &process_id));
   const void *values[] = { path, pid };
-  COMPILE_ASSERT(arraysize(keys) == arraysize(values), array_sizes_must_match);
+  static_assert(arraysize(keys) == arraysize(values),
+                "keys must have the same number of elements as values");
   return CFDictionaryCreate(kCFAllocatorDefault,
                             keys,
                             values,
@@ -177,8 +179,8 @@ CFDictionaryRef MockLaunchd::CopyDictionaryByCheckingIn(CFErrorRef* error) {
   if (!create_socket_) {
     const void *keys[] = { program, program_args };
     const void *values[] = { path, args };
-    COMPILE_ASSERT(arraysize(keys) == arraysize(values),
-                   array_sizes_must_match);
+    static_assert(arraysize(keys) == arraysize(values),
+                  "keys must have the same number of elements as values");
     return CFDictionaryCreate(kCFAllocatorDefault,
                               keys,
                               values,
@@ -230,8 +232,9 @@ CFDictionaryRef MockLaunchd::CopyDictionaryByCheckingIn(CFErrorRef* error) {
   CFStringRef socket_dict_key = CFSTR("ServiceProcessSocket");
   const void *socket_keys[] = { socket_dict_key };
   const void *socket_values[] = { sockets };
-  COMPILE_ASSERT(arraysize(socket_keys) == arraysize(socket_values),
-                 socket_array_sizes_must_match);
+  static_assert(arraysize(socket_keys) == arraysize(socket_values),
+                "socket_keys must have the same number of elements "
+                "as socket_values");
   base::ScopedCFTypeRef<CFDictionaryRef> socket_dict(
       CFDictionaryCreate(kCFAllocatorDefault,
                          socket_keys,
@@ -241,7 +244,8 @@ CFDictionaryRef MockLaunchd::CopyDictionaryByCheckingIn(CFErrorRef* error) {
                          &kCFTypeDictionaryValueCallBacks));
   const void *keys[] = { program, program_args, socket_key };
   const void *values[] = { path, args, socket_dict };
-  COMPILE_ASSERT(arraysize(keys) == arraysize(values), array_sizes_must_match);
+  static_assert(arraysize(keys) == arraysize(values),
+                "keys must have the same number of elements as values");
   return CFDictionaryCreate(kCFAllocatorDefault,
                             keys,
                             values,