Access singletons with a new GetInstance() method instead of Singleton<T>.

chrome/renderer/extensions/event_bindings.cc

 // Copyright (c) 2010 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/renderer/extensions/event_bindings.h"
 
 #include "base/basictypes.h"
-#include "base/singleton.h"
+#include "base/lazy_instance.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/extensions/bindings_utils.h"
 #include "chrome/renderer/extensions/event_bindings.h"
 #include "chrome/renderer/extensions/extension_process_bindings.h"
 #include "chrome/renderer/extensions/extension_renderer_info.h"
 #include "chrome/renderer/extensions/js_only_v8_extensions.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
 #include "googleurl/src/gurl.h"
@@ skipping 35 matching lines @@
 
 // A map of event names to the number of listeners for that event. We notify
 // the browser about event listeners when we transition between 0 and 1.
 typedef std::map<std::string, int> EventListenerCounts;
 
 struct SingletonData {
   // A map of extension IDs to listener counts for that extension.
   std::map<std::string, EventListenerCounts> listener_counts_;
 };
 
+static base::LazyInstance<SingletonData> g_singleton_data(
+    base::LINKER_INITIALIZED);
+
 static EventListenerCounts& GetListenerCounts(const std::string& extension_id) {
-  return Singleton<SingletonData>()->listener_counts_[extension_id];
+  return g_singleton_data.Get().listener_counts_[extension_id];
 }
 
 class ExtensionImpl : public ExtensionBase {
  public:
   ExtensionImpl()
       : ExtensionBase(EventBindings::kName,
                       GetStringResource<IDR_EVENT_BINDINGS_JS>(),
                       0, NULL) {
   }
   ~ExtensionImpl() {}
@@ skipping 292 matching lines @@
     // TODO(rafaelw): Consider only doing this check if function_name ==
     // "Event.dispatchJSON".
 #ifdef _DEBUG
     if (!retval.IsEmpty() && !retval->IsUndefined()) {
       std::string error = *v8::String::AsciiValue(retval);
       DCHECK(false) << error;
     }
 #endif
   }
 }