chrome: Remove 11 exit time destructors and 4 static initializers.

chrome/browser/themes/theme_service.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/themes/theme_service.h"
 
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 135 matching lines @@
   IDR_THEME_TAB_BACKGROUND_V,
   IDR_THEME_NTP_BACKGROUND,
   IDR_THEME_FRAME_OVERLAY,
   IDR_THEME_FRAME_OVERLAY_INACTIVE,
   IDR_THEME_BUTTON_BACKGROUND,
   IDR_THEME_NTP_ATTRIBUTION,
   IDR_THEME_WINDOW_CONTROL_BACKGROUND
 };
 
 bool HasThemeableImage(int themeable_image_id) {
-  static std::set<int> themeable_images;
+  CR_DEFINE_STATIC_LOCAL(std::set<int>, themeable_images, ());
   if (themeable_images.empty()) {
     themeable_images.insert(
         kThemeableImages, kThemeableImages + arraysize(kThemeableImages));
   }
   return themeable_images.count(themeable_image_id) > 0;
 }
 
 // The image resources that will be tinted by the 'button' tint value.
 // If you change this list, you must increment the version number in
 // browser_theme_pack.cc, and you should assign persistent IDs to the
@@ skipping 363 matching lines @@
     case NTP_LOGO_ALTERNATE:
       *result = kDefaultDisplayPropertyNTPInverseLogo;
       return true;
   }
 
   return false;
 }
 
 // static
 const std::set<int>& ThemeService::GetTintableToolbarButtons() {
-  static std::set<int> button_set;
+  CR_DEFINE_STATIC_LOCAL(std::set<int>, button_set, ());
   if (button_set.empty()) {
     button_set = std::set<int>(
         kToolbarButtonIDs,
         kToolbarButtonIDs + arraysize(kToolbarButtonIDs));
   }
 
   return button_set;
 }
 
 color_utils::HSL ThemeService::GetTint(int id) const {
@@ skipping 113 matching lines @@
 void ThemeService::OnInfobarDisplayed() {
   number_of_infobars_++;
 }
 
 void ThemeService::OnInfobarDestroyed() {
   number_of_infobars_--;
 
   if (number_of_infobars_ == 0)
     RemoveUnusedThemes();
 }