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

chrome/renderer/extensions/extension_process_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/extension_process_bindings.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
+#include "base/lazy_instance.h"
 #include "base/scoped_ptr.h"
-#include "base/singleton.h"
 #include "base/string_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/extensions/bindings_utils.h"
 #include "chrome/renderer/extensions/event_bindings.h"
@@ skipping 45 matching lines @@
   RendererExtensionBindings::kName,
   ExtensionApiTestV8Extension::kName,
 };
 
 struct SingletonData {
   std::set<std::string> function_names_;
   PageActionIdMap page_action_ids_;
   ExtensionPermissionsList permissions_;
 };
 
+static base::LazyInstance<SingletonData> g_singleton_data(
+    base::LINKER_INITIALIZED);
+
 static std::set<std::string>* GetFunctionNameSet() {
-  return &Singleton<SingletonData>()->function_names_;
+  return &g_singleton_data.Get().function_names_;
 }
 
 static PageActionIdMap* GetPageActionMap() {
-  return &Singleton<SingletonData>()->page_action_ids_;
+  return &g_singleton_data.Get().page_action_ids_;
 }
 
 static PermissionsList* GetPermissionsList(const std::string& extension_id) {
-  return &Singleton<SingletonData>()->permissions_[extension_id];
+  return &g_singleton_data.Get().permissions_[extension_id];
 }
 
 static void GetActiveExtensionIDs(std::set<std::string>* extension_ids) {
-  ExtensionPermissionsList& permissions =
-      Singleton<SingletonData>()->permissions_;
+  ExtensionPermissionsList& permissions = g_singleton_data.Get().permissions_;
 
   for (ExtensionPermissionsList::iterator iter = permissions.begin();
        iter != permissions.end(); ++iter) {
     extension_ids->insert(iter->first);
   }
 }
 
 // A RenderViewVisitor class that iterates through the set of available
 // views, looking for a view of the given type, in the given browser window
 // and within the given extension.
@@ skipping 563 matching lines @@
       const std::string& function_name) {
   static const char kMessage[] =
       "You do not have permission to use '%s'. Be sure to declare"
       " in your manifest what permissions you need.";
   std::string error_msg = StringPrintf(kMessage, function_name.c_str());
 
   return v8::ThrowException(v8::Exception::Error(
       v8::String::New(error_msg.c_str())));
 }