Switch to static_assert.

chrome/installer/util/channel_info.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/installer/util/channel_info.h"
 
 #include "base/logging.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/win/registry.h"
@@ skipping 35 matching lines @@
   MOD_CHROME_FRAME,
   MOD_APP_HOST_DEPRECATED,
   MOD_APP_LAUNCHER_DEPRECATED,
   MOD_READY_MODE,
   SFX_MULTI_FAIL,
   SFX_MIGRATING,
   SFX_FULL,
   NUM_MODIFIERS
 };
 
-COMPILE_ASSERT(NUM_MODIFIERS == arraysize(kModifiers),
-    kModifiers_disagrees_with_ModifierIndex_comma_they_must_match_bang);
+static_assert(NUM_MODIFIERS == arraysize(kModifiers),
+              "kModifiers disagrees with ModifierIndex; they must match!");
 
 // Returns true if the modifier is found, in which case |position| holds the
 // location at which the modifier was found.  The number of characters in the
 // modifier is returned in |length|, if non-NULL.
 bool FindModifier(ModifierIndex index,
                   const base::string16& ap_value,
                   base::string16::size_type* position,
                   base::string16::size_type* length) {
   DCHECK(position != NULL);
   base::string16::size_type mod_position = base::string16::npos;
@@ skipping 272 matching lines @@
 
   for (int scan = 0; scan < NUM_MODIFIERS; ++scan) {
     ModifierIndex index = static_cast<ModifierIndex>(scan);
     modified = SetModifier(index, false, &value_) || modified;
   }
 
   return modified;
 }
 
 }  // namespace installer