Improve DEFINE_STATIC_LOCAL()'s handling of Blink GCed objects.

third_party/WebKit/Source/modules/battery/BatteryDispatcher.cpp

 // Copyright 2014 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 "modules/battery/BatteryDispatcher.h"
 
 #include "platform/MojoHelper.h"
 #include "public/platform/Platform.h"
 #include "wtf/Assertions.h"
 #include "wtf/PassOwnPtr.h"
 
 namespace blink {
 
 BatteryDispatcher& BatteryDispatcher::instance()
 {
-    DEFINE_STATIC_LOCAL(Persistent<BatteryDispatcher>, batteryDispatcher, (new BatteryDispatcher()));
-    return *batteryDispatcher;
+    DEFINE_STATIC_LOCAL(BatteryDispatcher, batteryDispatcher, (new BatteryDispatcher));
+    return batteryDispatcher;
 }
 
 BatteryDispatcher::BatteryDispatcher()
     : m_hasLatestData(false)
 {
 }
 
 void BatteryDispatcher::queryNextStatus()
 {
     m_monitor->QueryNextStatus(
@@ skipping 33 matching lines @@
 
 void BatteryDispatcher::stopListening()
 {
     // m_monitor can be null during testing.
     if (m_monitor)
         m_monitor.reset();
     m_hasLatestData = false;
 }
 
 } // namespace blink