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

chrome/browser/character_encoding.cc

 // Copyright (c) 2011 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/character_encoding.h"
 
 #include <map>
 #include <set>
 
 #include "base/logging.h"
@@ skipping 392 matching lines @@
     if (alias_name == "US-ASCII")
       return GetCanonicalEncodingNameByCommandId(IDC_ENCODING_ISO88591);
     return canonical_name;
   } else {
     return std::string();
   }
 }
 
 // Static
 // According to the behavior of user recently selected encoding short list in
-// 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.
+// 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.
 const std::vector<CharacterEncoding::EncodingInfo>*
     CharacterEncoding::GetCurrentDisplayEncodings(
     const std::string& locale,
     const std::string& locale_encodings,
     const std::string& recently_select_encodings) {
   std::vector<int>* const locale_dependent_encoding_list =
       CanonicalEncodingMapSingleton()->locale_dependent_encoding_ids();
   std::vector<CharacterEncoding::EncodingInfo>* const encoding_list =
       CanonicalEncodingMapSingleton()->current_display_encodings();
 
   // Initialize locale dependent static encoding list.
   if (locale_dependent_encoding_list->empty() && !locale_encodings.empty())
     ParseEncodingListSeparatedWithComma(locale_encodings,
                                         locale_dependent_encoding_list,
                                         kUserSelectedEncodingsMaxLength);
 
-  static std::string cached_user_selected_encodings;
+  CR_DEFINE_STATIC_LOCAL(std::string, cached_user_selected_encodings, ());
   // Build current display encoding list.
   if (encoding_list->empty() ||
       cached_user_selected_encodings != recently_select_encodings) {
     // Update user recently selected encodings.
     cached_user_selected_encodings = recently_select_encodings;
     // Clear old encoding list since user recently selected encodings changed.
     encoding_list->clear();
     // Always add UTF-8 to first encoding position.
     encoding_list->push_back(EncodingInfo(IDC_ENCODING_UTF8));
     std::set<int> inserted_encoding;
@@ skipping 94 matching lines @@
   // Insert new encoding to head of selected encoding list.
   *selected_encodings = encoding_name;
   // Generate the string for rest selected encoding list.
   for (std::vector<int>::const_iterator it = selected_encoding_list.begin();
        it != selected_encoding_list.end(); ++it) {
     selected_encodings->append(1, L',');
     selected_encodings->append(GetCanonicalEncodingNameByCommandId(*it));
   }
   return true;
 }