CrOs: Remove 2 static initializers and 2 exit time destructors.

chrome/browser/chromeos/status/network_menu_icon.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/chromeos/status/network_menu_icon.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/utf_string_conversions.h"
@@ skipping 14 matching lines @@
 namespace {
 
 // Amount to fade icons while connecting.
 const double kConnectingImageAlpha = 0.5;
 
 // Animation cycle length.
 const int kThrobDurationMs = 750;
 
 // Network strength bars images.
 const int kNumBarsImages = 5;
-SkBitmap kBarsImagesAnimating[kNumBarsImages - 1];
+SkBitmap* kBarsImagesAnimating[kNumBarsImages - 1];
 
 // Network strength arcs images.
 const int kNumArcsImages = 5;
-SkBitmap kArcsImagesAnimating[kNumArcsImages - 1];
+SkBitmap* kArcsImagesAnimating[kNumArcsImages - 1];
 
 // Badge offsets.  If a badge is large enough that it won't fit within the icon
 // when using the right or bottom offset, it gets shifted inwards so it will.
 const int kBadgeLeftX = 0;
 const int kBadgeRightX = 14;
 const int kBadgeTopY = 0;
 const int kBadgeBottomY = 14;
 
 // ID for VPN badge. TODO(stevenjb): replace with yellow lock icon.
 const int kVpnBadgeId = IDR_STATUSBAR_NETWORK_SECURE;
@@ skipping 469 matching lines @@
     return 0;
   }
   return animation_connecting_.GetCurrentValue();
 }
 
 // Fades the bars a bit and cycles through the different bar states.
 void NetworkMenuIcon::SetConnectingIcon(const Network* network,
                                         double animation) {
   int image_count;
   BitmapType bitmap_type;
-  SkBitmap* images;
+  SkBitmap** images;
 
   if (network->type() == TYPE_WIFI) {
     image_count = kNumArcsImages - 1;
     bitmap_type = ARCS;
     images = kArcsImagesAnimating;
   } else {
     image_count = kNumBarsImages - 1;
     bitmap_type = BARS;
     images = kBarsImagesAnimating;
   }
   int index = static_cast<int>(
       animation * nextafter(static_cast<float>(image_count), 0));
   index = max(min(index, image_count - 1), 0);
 
   // Lazily cache images.
-  if (images[index].empty()) {
+  if (!images[index]) {
     SkBitmap source = GetBitmap(bitmap_type, index + 1);
-    images[index] = NetworkMenuIcon::GenerateConnectingBitmap(source);
+    images[index] =
+        new SkBitmap(NetworkMenuIcon::GenerateConnectingBitmap(source));
   }
-  icon_->set_icon(images[index]);
+  icon_->set_icon(*images[index]);
 }
 
 // Sets up the icon and badges for GenerateBitmap().
 void NetworkMenuIcon::SetIconAndText(string16* text) {
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   DCHECK(cros);
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
   icon_->ClearIconAndBadges();
 
@@ skipping 235 matching lines @@
 
 const SkBitmap NetworkMenuIcon::GetConnectedBitmap(BitmapType type) {
   return GetBitmap(type, NumBitmaps(type) - 1);
 }
 
 int NetworkMenuIcon::NumBitmaps(BitmapType type) {
   return (type == ARCS) ? kNumArcsImages : kNumBarsImages;
 }
 
 }  // chromeos