Revert 110235 - chrome: Remove 14 exit time destructors and 2 static initializers.

chrome/browser/character_encoding.cc

Index: chrome/browser/character_encoding.cc
===================================================================
--- chrome/browser/character_encoding.cc	(revision 110237)
+++ chrome/browser/character_encoding.cc	(working copy)
@@ -410,9 +410,9 @@
 
 // Static
 // According to the behavior of user recently selected encoding short list in
-// Firefox, we always put UTF-8 as top position, after then put user
-// recent selected encodings, then put local dependent encoding items.
-// At last, we put all remaining encoding items.
+// FireFox, we always put UTF-8 as toppest position, after then put user
+// recently selected encodings, then put local dependent encoding items.
+// At last, we put all rest encoding items.
 const std::vector<CharacterEncoding::EncodingInfo>*
     CharacterEncoding::GetCurrentDisplayEncodings(
     const std::string& locale,
@@ -429,7 +429,7 @@
                                         locale_dependent_encoding_list,
                                         kUserSelectedEncodingsMaxLength);
 
-  CR_DEFINE_STATIC_LOCAL(std::string, cached_user_selected_encodings, ());
+  static std::string cached_user_selected_encodings;
   // Build current display encoding list.
   if (encoding_list->empty() ||
       cached_user_selected_encodings != recently_select_encodings) {