replace COMPILE_ASSERT with static_assert in chrome/browser/

chrome/browser/profile_resetter/resettable_settings_snapshot.cc

 // Copyright (c) 2013 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/profile_resetter/resettable_settings_snapshot.h"
 
 #include "base/json/json_writer.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 108 matching lines @@
 
   if (dse_url_ != snapshot.dse_url_)
     bit_mask |= DSE_URL;
 
   if (enabled_extensions_ != snapshot.enabled_extensions_)
     bit_mask |= EXTENSIONS;
 
   if (shortcuts_ != snapshot.shortcuts_)
     bit_mask |= SHORTCUTS;
 
-  COMPILE_ASSERT(ResettableSettingsSnapshot::ALL_FIELDS == 31,
-                 add_new_field_here);
+  static_assert(ResettableSettingsSnapshot::ALL_FIELDS == 31,
+                "new field needs to be added here");
 
   return bit_mask;
 }
 
 void ResettableSettingsSnapshot::RequestShortcuts(
     const base::Closure& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   DCHECK(!cancellation_flag_.get() && !shortcuts_determined());
 
   cancellation_flag_ = new SharedCancellationFlag;
@@ skipping 63 matching lines @@
          i != shortcuts.end(); ++i) {
       base::string16 arguments;
       // Replace "\"" to simplify server-side analysis.
       base::ReplaceChars(i->second, base::ASCIIToUTF16("\""),
                          base::ASCIIToUTF16("\'"), &arguments);
       list->AppendString(arguments);
     }
     dict.Set(kShortcuts, list);
   }
 
-  COMPILE_ASSERT(ResettableSettingsSnapshot::ALL_FIELDS == 31,
-                 serialize_new_field_here);
+  static_assert(ResettableSettingsSnapshot::ALL_FIELDS == 31,
+                "new field needs to be serialized here");
 
   std::string json;
   base::JSONWriter::Write(&dict, &json);
   return json;
 }
 
 void SendSettingsFeedback(const std::string& report,
                           Profile* profile,
                           SnapshotCaller caller) {
   scoped_refptr<FeedbackData> feedback_data = new FeedbackData();
@@ skipping 133 matching lines @@
       extension_names += '\n';
     extension_names += i->second;
   }
   if (!extension_names.empty()) {
     AddPair(list.get(),
             l10n_util::GetStringUTF16(IDS_RESET_PROFILE_SETTINGS_EXTENSIONS),
             extension_names);
   }
   return list.Pass();
 }