CrOs: Remove 29 exit time destructors and 8 static initializers.

chrome/browser/chromeos/dbus/power_manager_client.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/dbus/power_manager_client.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 14 matching lines @@
 PowerSupplyStatus::PowerSupplyStatus()
     : line_power_on(false),
       battery_is_present(false),
       battery_is_full(false),
       battery_seconds_to_empty(0),
       battery_seconds_to_full(0),
       battery_percentage(0) {
 }
 
 const std::string& PowerSupplyStatus::ToString() const {
-  static std::string result = "";
+  // TODO(thakis): This looks weird. This should probably not be static, and
+  // the function should just return a string by value.
+  CR_DEFINE_STATIC_LOCAL(std::string, result, ());
   base::StringAppendF(&result,
                       "line_power_on = %s ",
                       line_power_on ? "true" : "false");
   base::StringAppendF(&result,
                       "battery_is_present = %s ",
                       battery_is_present ? "true" : "false");
   base::StringAppendF(&result,
                       "battery_is_full = %s ",
                       battery_is_full ? "true" : "false");
   base::StringAppendF(&result,
@@ skipping 329 matching lines @@
 
 PowerManagerClient* PowerManagerClient::Create(dbus::Bus* bus) {
   if (system::runtime_environment::IsRunningOnChromeOS()) {
     return new PowerManagerClientImpl(bus);
   } else {
     return new PowerManagerClientStubImpl();
   }
 }
 
 }  // namespace chromeos