Make members of Singleton<T> private and only visible to the singleton type.

chrome/renderer/extensions/bindings_utils.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/bindings_utils.h"
 
+#include "base/lazy_instance.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "chrome/renderer/render_view.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 
 using WebKit::WebFrame;
 using WebKit::WebView;
 
 namespace bindings_utils {
 
 const char* kChromeHidden = "chromeHidden";
 const char* kValidateCallbacks = "validateCallbacks";
 
 struct SingletonData {
   ContextList contexts;
   PendingRequestMap pending_requests;
 };
+static base::LazyInstance<SingletonData> g_singleton_data(
+    base::LINKER_INITIALIZED);
 
 typedef std::map<int, std::string> StringMap;
+static base::LazyInstance<StringMap> g_string_map(base::LINKER_INITIALIZED);
 
 const char* GetStringResource(int resource_id) {
-  StringMap* strings = Singleton<StringMap>::get();
+  StringMap* strings = g_string_map.Pointer();
   StringMap::iterator it = strings->find(resource_id);
   if (it == strings->end()) {
     it = strings->insert(std::make_pair(
         resource_id,
         ResourceBundle::GetSharedInstance().GetRawDataResource(
             resource_id).as_string())).first;
   }
   return it->second.c_str();
 }
 
@@ skipping 38 matching lines @@
     : context(context),
       extension_id(extension_id),
       parent_frame(parent_frame),
       render_view(render_view),
       num_connected_events(0) {
 }
 
 ContextInfo::~ContextInfo() {}
 
 ContextList& GetContexts() {
-  return Singleton<SingletonData>::get()->contexts;
+  return g_singleton_data.Get().contexts;
 }
 
 ContextList GetContextsForExtension(const std::string& extension_id) {
   ContextList& all_contexts = GetContexts();
   ContextList contexts;
 
   for (ContextList::iterator it = all_contexts.begin();
        it != all_contexts.end(); ++it) {
      if ((*it)->extension_id == extension_id)
        contexts.push_back(*it);
@@ skipping 29 matching lines @@
   ContextList::iterator it = all_contexts.begin();
   for (; it != all_contexts.end(); ++it) {
     if ((*it)->context == context)
       break;
   }
 
   return it;
 }
 
 PendingRequestMap& GetPendingRequestMap() {
-  return Singleton<SingletonData>::get()->pending_requests;
+  return g_singleton_data.Get().pending_requests;
 }
 
 RenderView* GetRenderViewForCurrentContext() {
   WebFrame* webframe = WebFrame::frameForCurrentContext();
   DCHECK(webframe) << "RetrieveCurrentFrame called when not in a V8 context.";
   if (!webframe)
     return NULL;
 
   WebView* webview = webframe->view();
   if (!webview)
@@ skipping 25 matching lines @@
   }
 
   v8::Local<v8::Function> function = v8::Local<v8::Function>::Cast(value);
   if (!function.IsEmpty())
     return function->Call(v8::Object::New(), argc, argv);
 
   return v8::Undefined();
 }
 
 }  // namespace bindings_utils