replace COMPILE_ASSERT with static_assert in chrome/browser/

BUG=442514

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

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

6 files changed, 21 insertions, 21 deletions

diff --git a/chrome/browser/prerender/prerender_events.cc b/chrome/browser/prerender/prerender_events.cc
index 5e8389d..a7ac644 100644
--- a/chrome/browser/prerender/prerender_events.cc
+++ b/chrome/browser/prerender/prerender_events.cc
@@ -38,8 +38,8 @@ const char* kEventNames[] = {
   "Max",
 };
 
-COMPILE_ASSERT(arraysize(kEventNames) == PRERENDER_EVENT_MAX + 1,
-               PrerenderEvent_name_count_mismatch);
+static_assert(arraysize(kEventNames) == PRERENDER_EVENT_MAX + 1,
+              "kEventNames array size is incorrect");
 
 }  // namespace
 
diff --git a/chrome/browser/prerender/prerender_field_trial.cc b/chrome/browser/prerender/prerender_field_trial.cc
index 468d44b..d505582 100644
--- a/chrome/browser/prerender/prerender_field_trial.cc
+++ b/chrome/browser/prerender/prerender_field_trial.cc
@@ -105,14 +105,14 @@ void SetupPrerenderFieldTrial() {
     const FieldTrial::Probability release_experiment_no_use_probability = 0;
     const FieldTrial::Probability
         release_experiment_match_complete_probability = 10;
-    COMPILE_ASSERT(
+    static_assert(
         release_prerender_enabled_probability +
         release_control_probability +
         release_experiment_multi_prerender_probability +
         release_experiment_15min_ttl_probability +
         release_experiment_no_use_probability +
         release_experiment_match_complete_probability == divisor,
-        release_experiment_probabilities_must_equal_divisor);
+        "release experiment probabilities must equal divisor");
 
     control_probability = release_control_probability;
     experiment_multi_prerender_probability =
@@ -132,13 +132,13 @@ void SetupPrerenderFieldTrial() {
     const FieldTrial::Probability dev_experiment_no_use_probability = 100;
     const FieldTrial::Probability
         dev_experiment_match_complete_probability = 200;
-    COMPILE_ASSERT(dev_prerender_enabled_probability +
-                   dev_control_probability +
-                   dev_experiment_multi_prerender_probability +
-                   dev_experiment_15min_ttl_probability +
-                   dev_experiment_no_use_probability +
-                   dev_experiment_match_complete_probability == divisor,
-                   dev_experiment_probabilities_must_equal_divisor);
+    static_assert(dev_prerender_enabled_probability +
+                  dev_control_probability +
+                  dev_experiment_multi_prerender_probability +
+                  dev_experiment_15min_ttl_probability +
+                  dev_experiment_no_use_probability +
+                  dev_experiment_match_complete_probability == divisor,
+                  "dev experiment probabilities must equal divisor");
 
     control_probability = dev_control_probability;
     experiment_multi_prerender_probability =
diff --git a/chrome/browser/prerender/prerender_final_status.cc b/chrome/browser/prerender/prerender_final_status.cc
index eae02a6..3c7e8f9 100644
--- a/chrome/browser/prerender/prerender_final_status.cc
+++ b/chrome/browser/prerender/prerender_final_status.cc
@@ -65,8 +65,8 @@ const char* kFinalStatusNames[] = {
   "Navigation Intercepted",
   "Max",
 };
-COMPILE_ASSERT(arraysize(kFinalStatusNames) == FINAL_STATUS_MAX + 1,
-               PrerenderFinalStatus_name_count_mismatch);
+static_assert(arraysize(kFinalStatusNames) == FINAL_STATUS_MAX + 1,
+              "status name count mismatch");
 
 }  // namespace
 
diff --git a/chrome/browser/prerender/prerender_link_manager.cc b/chrome/browser/prerender/prerender_link_manager.cc
index 21a1dac..8120577 100644
--- a/chrome/browser/prerender/prerender_link_manager.cc
+++ b/chrome/browser/prerender/prerender_link_manager.cc
@@ -60,10 +60,10 @@ bool ShouldStartPrerender(const uint32 rel_types) {
   return false;
 }
 
-COMPILE_ASSERT(PrerenderRelTypePrerender == 0x1,
-               RelTypeHistogramEnum_must_match_PrerenderRelType);
-COMPILE_ASSERT(PrerenderRelTypeNext == 0x2,
-               RelTypeHistogramEnum_must_match_PrerenderRelType);
+static_assert(PrerenderRelTypePrerender == 0x1,
+              "RelTypeHistogrameEnum must match PrerenderRelType");
+static_assert(PrerenderRelTypeNext == 0x2,
+              "RelTypeHistogramEnum must match PrerenderRelType");
 enum RelTypeHistogramEnum {
   RelTypeHistogramEnumNone = 0,
   RelTypeHistogramEnumPrerender = PrerenderRelTypePrerender,
diff --git a/chrome/browser/prerender/prerender_local_predictor.cc b/chrome/browser/prerender/prerender_local_predictor.cc
index 3516d95..1da0f04 100644
--- a/chrome/browser/prerender/prerender_local_predictor.cc
+++ b/chrome/browser/prerender/prerender_local_predictor.cc
@@ -307,14 +307,14 @@ bool IsLogOutURL(const GURL& url) {
 }
 
 int64 URLHashToInt64(const unsigned char* data) {
-  COMPILE_ASSERT(kURLHashSize < sizeof(int64), url_hash_must_fit_in_int64);
+  static_assert(kURLHashSize < sizeof(int64), "url hash must fit in int64");
   int64 value = 0;
   memcpy(&value, data, kURLHashSize);
   return value;
 }
 
 int64 GetInt64URLHashForURL(const GURL& url) {
-  COMPILE_ASSERT(kURLHashSize < sizeof(int64), url_hash_must_fit_in_int64);
+  static_assert(kURLHashSize < sizeof(int64), "url hash must fit in int64");
   scoped_ptr<crypto::SecureHash> hash(
       crypto::SecureHash::Create(crypto::SecureHash::SHA256));
   int64 hash_value = 0;
diff --git a/chrome/browser/prerender/prerender_origin.cc b/chrome/browser/prerender/prerender_origin.cc
index 56e6c07..ae8d9ac 100644
--- a/chrome/browser/prerender/prerender_origin.cc
+++ b/chrome/browser/prerender/prerender_origin.cc
@@ -28,8 +28,8 @@ const char* kOriginNames[] = {
   "Link Rel Next",
   "Max",
 };
-COMPILE_ASSERT(arraysize(kOriginNames) == ORIGIN_MAX + 1,
-               PrerenderOrigin_name_count_mismatch);
+static_assert(arraysize(kOriginNames) == ORIGIN_MAX + 1,
+              "prerender origin name count mismatch");
 
 }  // namespace