replace COMPILE_ASSERT with static_assert in chrome/browser/

chrome/browser/ui/website_settings/website_settings_ui.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/browser/ui/website_settings/website_settings_ui.h"
 
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 namespace {
 
 const int kInvalidResourceID = -1;
 
 // The resource id's for the strings that are displayed on the permissions
 // button if the permission setting is managed by policy.
 const int kPermissionButtonTextIDPolicyManaged[] = {
     kInvalidResourceID,
     IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ALLOWED_BY_POLICY,
     IDS_WEBSITE_SETTINGS_BUTTON_TEXT_BLOCKED_BY_POLICY,
     kInvalidResourceID,
     kInvalidResourceID,
     kInvalidResourceID};
-COMPILE_ASSERT(arraysize(kPermissionButtonTextIDPolicyManaged) ==
-               CONTENT_SETTING_NUM_SETTINGS,
-               button_text_id_array_size_incorrect);
+static_assert(arraysize(kPermissionButtonTextIDPolicyManaged) ==
+              CONTENT_SETTING_NUM_SETTINGS,
+              "button text id array size must equal "

[Nico, 2014/12/23 01:32:12]

nit: also just "is incorrect" to not repeat the condition

[Mostyn Bramley-Moore, 2014/12/23 08:16:37]

Done.

+              "CONTENT_SETTING_NUM_SETTINGS");
 
 // The resource id's for the strings that are displayed on the permissions
 // button if the permission setting is managed by an extension.
 const int kPermissionButtonTextIDExtensionManaged[] = {
     kInvalidResourceID,
     IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ALLOWED_BY_EXTENSION,
     IDS_WEBSITE_SETTINGS_BUTTON_TEXT_BLOCKED_BY_EXTENSION,
     kInvalidResourceID,
     kInvalidResourceID,
     kInvalidResourceID};
-COMPILE_ASSERT(arraysize(kPermissionButtonTextIDExtensionManaged) ==
-               CONTENT_SETTING_NUM_SETTINGS,
-               button_text_id_array_size_incorrect);
+static_assert(arraysize(kPermissionButtonTextIDExtensionManaged) ==
+              CONTENT_SETTING_NUM_SETTINGS,
+              "button text id array size must equal "
+              "CONTENT_SETTING_NUM_SETTINGS");
 
 // The resource id's for the strings that are displayed on the permissions
 // button if the permission setting is managed by the user.
 const int kPermissionButtonTextIDUserManaged[] = {
     kInvalidResourceID,
     IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ALLOWED_BY_USER,
     IDS_WEBSITE_SETTINGS_BUTTON_TEXT_BLOCKED_BY_USER,
     kInvalidResourceID,
     kInvalidResourceID,
     kInvalidResourceID};
-COMPILE_ASSERT(arraysize(kPermissionButtonTextIDUserManaged) ==
-               CONTENT_SETTING_NUM_SETTINGS,
-               button_text_id_array_size_incorrect);
+static_assert(arraysize(kPermissionButtonTextIDUserManaged) ==
+              CONTENT_SETTING_NUM_SETTINGS,
+              "button text id array size must equal "
+              "CONTENT_SETTING_NUM_SETTINGS");
 
 // The resource id's for the strings that are displayed on the permissions
 // button if the permission setting is the global default setting.
 const int kPermissionButtonTextIDDefaultSetting[] = {
     kInvalidResourceID,
     IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ALLOWED_BY_DEFAULT,
     IDS_WEBSITE_SETTINGS_BUTTON_TEXT_BLOCKED_BY_DEFAULT,
     IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ASK_BY_DEFAULT,
     kInvalidResourceID,
     IDS_WEBSITE_SETTINGS_BUTTON_TEXT_DETECT_IMPORTANT_CONTENT_BY_DEFAULT};
-COMPILE_ASSERT(arraysize(kPermissionButtonTextIDDefaultSetting) ==
-               CONTENT_SETTING_NUM_SETTINGS,
-               button_text_id_array_size_incorrect);
+static_assert(arraysize(kPermissionButtonTextIDDefaultSetting) ==
+              CONTENT_SETTING_NUM_SETTINGS,
+              "button text id array size must equal "
+              "CONTENT_SETTING_NUM_SETTINGS");
 
 }  // namespace
 
 WebsiteSettingsUI::CookieInfo::CookieInfo()
     : allowed(-1), blocked(-1) {
 }
 
 WebsiteSettingsUI::PermissionInfo::PermissionInfo()
     : type(CONTENT_SETTINGS_TYPE_DEFAULT),
       setting(CONTENT_SETTING_DEFAULT),
@@ skipping 254 matching lines @@
   // the first time.
   return IDR_PAGEINFO_INFO;
 }
 
 // static
 const gfx::Image& WebsiteSettingsUI::GetFirstVisitIcon(
     const base::string16& first_visit) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   return rb.GetNativeImageNamed(GetFirstVisitIconID(first_visit));
 }