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

chrome/plugin/webplugin_proxy.cc

 // Copyright (c) 2009 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/plugin/webplugin_proxy.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include "app/win_util.h"
 #endif
+#include "base/lazy_instance.h"
 #if defined(OS_MACOSX)
 #include "base/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #endif
 #include "base/scoped_handle.h"
 #include "base/shared_memory.h"
-#include "base/singleton.h"
 #include "build/build_config.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/plugin/npobject_proxy.h"
 #include "chrome/plugin/npobject_util.h"
 #include "chrome/plugin/plugin_channel.h"
 #include "chrome/plugin/plugin_thread.h"
 #if defined(OS_MACOSX)
 #include "chrome/plugin/webplugin_accelerated_surface_proxy_mac.h"
@@ skipping 11 matching lines @@
 #include "app/x11_util_internal.h"
 #endif
 
 using WebKit::WebBindings;
 using webkit_glue::WebPluginResourceClient;
 #if defined(OS_MACOSX)
 using webkit_glue::WebPluginAcceleratedSurface;
 #endif
 
 typedef std::map<CPBrowsingContext, WebPluginProxy*> ContextMap;
-static ContextMap& GetContextMap() {
-  return *Singleton<ContextMap>::get();
-}
+static base::LazyInstance<ContextMap> g_context_map(base::LINKER_INITIALIZED);
 
 WebPluginProxy::WebPluginProxy(
     PluginChannel* channel,
     int route_id,
     const GURL& page_url,
     gfx::NativeViewId containing_window,
     int host_render_view_routing_id)
     : channel_(channel),
       route_id_(route_id),
       cp_browsing_context_(0),
@@ skipping 23 matching lines @@
         if (vis->red_mask == 0xff0000 &&
             vis->green_mask == 0xff00 &&
             vis->blue_mask == 0xff)
           use_shm_pixmap_ = true;
       }
 #endif
 }
 
 WebPluginProxy::~WebPluginProxy() {
   if (cp_browsing_context_)
-    GetContextMap().erase(cp_browsing_context_);
+    g_context_map.Get().erase(cp_browsing_context_);
 
 #if defined(USE_X11)
   if (windowless_shm_pixmap_ != None)
     XFreePixmap(x11_util::GetXDisplay(), windowless_shm_pixmap_);
 #endif
 
 #if defined(OS_MACOSX)
   // Destroy the surface early, since it may send messages during cleanup.
   if (accelerated_surface_.get())
     accelerated_surface_.reset();
@@ skipping 157 matching lines @@
 }
 
 void WebPluginProxy::OnMissingPluginStatus(int status) {
   Send(new PluginHostMsg_MissingPluginStatus(route_id_, status));
 }
 
 CPBrowsingContext WebPluginProxy::GetCPBrowsingContext() {
   if (cp_browsing_context_ == 0) {
     Send(new PluginHostMsg_GetCPBrowsingContext(route_id_,
                                                 &cp_browsing_context_));
-    GetContextMap()[cp_browsing_context_] = this;
+    g_context_map.Get()[cp_browsing_context_] = this;
   }
   return cp_browsing_context_;
 }
 
 WebPluginProxy* WebPluginProxy::FromCPBrowsingContext(
     CPBrowsingContext context) {
-  return GetContextMap()[context];
+  return g_context_map.Get()[context];
 }
 
 WebPluginResourceClient* WebPluginProxy::GetResourceClient(int id) {
   ResourceClientMap::iterator iterator = resource_clients_.find(id);
   // The IPC messages which deal with streams are now asynchronous. It is
   // now possible to receive stream messages from the renderer for streams
   // which may have been cancelled by the plugin.
   if (iterator == resource_clients_.end()) {
     return NULL;
   }
@@ skipping 437 matching lines @@
     } else {
       index++;
     }
   }
 }
 
 void WebPluginProxy::URLRedirectResponse(bool allow, int resource_id) {
   Send(new PluginHostMsg_URLRedirectResponse(route_id_, allow, resource_id));
 }