Remove 4 exit time destructors from ui and content for linux and chromeos.

BUG=10600
TEST=none
TBR=ben

Review URL: http://codereview.chromium.org/8510019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109271 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 5 insertions, 5 deletions

diff --git a/content/browser/renderer_host/render_widget_host_view_gtk.cc b/content/browser/renderer_host/render_widget_host_view_gtk.cc
index da6867d..9822426a 100644
--- a/content/browser/renderer_host/render_widget_host_view_gtk.cc
+++ b/content/browser/renderer_host/render_widget_host_view_gtk.cc
@@ -1023,7 +1023,7 @@ void RenderWidgetHostViewGtk::ModifyEventForEdgeDragging(
   int new_dragged_at_vertical_edge = 0;
   // Used for checking the edges of the monitor. We cache the values to save
   // roundtrips to the X server.
-  static gfx::Size drag_monitor_size;
+  CR_DEFINE_STATIC_LOCAL(gfx::Size, drag_monitor_size, ());
   if (event->state & GDK_BUTTON1_MASK) {
     if (drag_monitor_size.IsEmpty()) {
       // We can safely cache the monitor size for the duration of a drag.
diff --git a/ui/base/x/x11_util.cc b/ui/base/x/x11_util.cc
index 873996f..d901a72 100644
--- a/ui/base/x/x11_util.cc
+++ b/ui/base/x/x11_util.cc
@@ -216,7 +216,7 @@ int GetDefaultScreen(Display* display) {
 }
 
 Cursor GetXCursor(int cursor_shape) {
-  static XCursorCache cache;
+  CR_DEFINE_STATIC_LOCAL(XCursorCache, cache, ());
   return cache.GetCursor(cursor_shape);
 }
 
diff --git a/ui/gfx/gtk_util.cc b/ui/gfx/gtk_util.cc
index aa336e8..b1f0dd7 100644
--- a/ui/gfx/gtk_util.cc
+++ b/ui/gfx/gtk_util.cc
@@ -137,7 +137,7 @@ void SubtractRectanglesFromRegion(GdkRegion* region,
 }
 
 GdkCursor* GetCursor(int type) {
-  static GdkCursorCache impl;
+  CR_DEFINE_STATIC_LOCAL(GdkCursorCache, impl, ());
   return impl.GetCursorImpl(static_cast<GdkCursorType>(type));
 }
 
diff --git a/ui/gfx/native_theme_chromeos.cc b/ui/gfx/native_theme_chromeos.cc
index c80c5ed..ebb5ba8 100644
--- a/ui/gfx/native_theme_chromeos.cc
+++ b/ui/gfx/native_theme_chromeos.cc
@@ -240,7 +240,7 @@ const NativeTheme* NativeTheme::instance() {
 // static
 const NativeThemeChromeos* NativeThemeChromeos::instance() {
   // The global NativeThemeChromeos instance.
-  static NativeThemeChromeos s_native_theme;
+  CR_DEFINE_STATIC_LOCAL(NativeThemeChromeos, s_native_theme, ());
   return &s_native_theme;
 }
 
diff --git a/ui/gfx/native_theme_gtk.cc b/ui/gfx/native_theme_gtk.cc
index 00ddc5f..60b1449 100644
--- a/ui/gfx/native_theme_gtk.cc
+++ b/ui/gfx/native_theme_gtk.cc
@@ -13,7 +13,7 @@ const NativeTheme* NativeTheme::instance() {
 
 // static
 const NativeThemeGtk* NativeThemeGtk::instance() {
-  static const NativeThemeGtk s_native_theme;
+  CR_DEFINE_STATIC_LOCAL(NativeThemeGtk, s_native_theme, ());
   return &s_native_theme;
 }