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

chrome/common/extensions/extension_l10n_util.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/common/extensions/extension_l10n_util.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/json/json_value_serializer.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/extension_message_bundle.h"
 #include "chrome/common/url_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "unicode/uloc.h"
 
 namespace errors = extension_manifest_errors;
 namespace keys = extension_manifest_keys;
 
-static std::string* GetProcessLocale() {
-  static std::string locale;
-  return &locale;
+static std::string& GetProcessLocale() {
+  CR_DEFINE_STATIC_LOCAL(std::string, locale, ());
+  return locale;
 }
 
 namespace extension_l10n_util {
 
 void SetProcessLocale(const std::string& locale) {
-  *(GetProcessLocale()) = locale;
+  GetProcessLocale() = locale;
 }
 
 std::string GetDefaultLocaleFromManifest(const DictionaryValue& manifest,
                                          std::string* error) {
   std::string default_locale;
   if (manifest.GetString(keys::kDefaultLocale, &default_locale))
     return default_locale;
 
   *error = errors::kInvalidDefaultLocale;
   return "";
@@ skipping 128 matching lines @@
   } else {
     *error = base::StringPrintf("Catalog file is missing for locale %s.",
                                 locale_name.c_str());
     return false;
   }
 
   return true;
 }
 
 std::string CurrentLocaleOrDefault() {
-  std::string current_locale = l10n_util::NormalizeLocale(*GetProcessLocale());
+  std::string current_locale = l10n_util::NormalizeLocale(GetProcessLocale());
   if (current_locale.empty())
     current_locale = "en";
 
   return current_locale;
 }
 
 void GetAllLocales(std::set<std::string>* all_locales) {
   const std::vector<std::string>& available_locales =
       l10n_util::GetAvailableLocales();
   // Add all parents of the current locale to the available locales set.
   // I.e. for sr_Cyrl_RS we add sr_Cyrl_RS, sr_Cyrl and sr.
   for (size_t i = 0; i < available_locales.size(); ++i) {
     std::vector<std::string> result;
     l10n_util::GetParentLocales(available_locales[i], &result);
     all_locales->insert(result.begin(), result.end());
   }
 }
 
 bool GetValidLocales(const FilePath& locale_path,
                      std::set<std::string>* valid_locales,
                      std::string* error) {
-  static std::set<std::string> chrome_locales;
+  std::set<std::string> chrome_locales;
   GetAllLocales(&chrome_locales);
 
   // Enumerate all supplied locales in the extension.
   file_util::FileEnumerator locales(locale_path,
                                     false,
                                     file_util::FileEnumerator::DIRECTORIES);
   FilePath locale_folder;
   while (!(locale_folder = locales.Next()).empty()) {
     std::string locale_name = locale_folder.BaseName().MaybeAsASCII();
     if (locale_name.empty()) {
@@ skipping 87 matching lines @@
   if (std::find(subdir.begin(), subdir.end(), '.') != subdir.end())
     return true;
 
   if (all_locales.find(subdir) == all_locales.end())
     return true;
 
   return false;
 }
 
 }  // namespace extension_l10n_util