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

webkit/glue/plugins/pepper_graphics_3d.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 "webkit/glue/plugins/pepper_graphics_3d.h"
 
 #include "gpu/command_buffer/common/command_buffer.h"
-#include "base/singleton.h"
+#include "base/lazy_instance.h"
 #include "base/thread_local.h"
 #include "ppapi/c/dev/ppb_graphics_3d_dev.h"
 #include "webkit/glue/plugins/pepper_common.h"
 #include "webkit/glue/plugins/pepper_plugin_instance.h"
 
 namespace pepper {
 
 namespace {
 
-struct CurrentContextTag {};
-typedef Singleton<base::ThreadLocalPointer<Graphics3D>,
-    DefaultSingletonTraits<base::ThreadLocalPointer<Graphics3D> >,
-    CurrentContextTag> CurrentContextKey;
+static base::LazyInstance<base::ThreadLocalPointer<Graphics3D> >
+    g_current_context_key(base::LINKER_INITIALIZED);
 
 // Size of the transfer buffer.
 enum { kTransferBufferSize = 512 * 1024 };
 
 PP_Bool IsGraphics3D(PP_Resource resource) {
   return BoolToPPBool(!!Resource::GetAs<Graphics3D>(resource));
 }
 
 PP_Bool GetConfigs(int32_t* configs, int32_t config_size, int32_t* num_config) {
   // TODO(neb): Implement me!
@@ skipping 99 matching lines @@
 Graphics3D::Graphics3D(PluginModule* module)
   : Resource(module),
     bound_instance_(NULL) {
 }
 
 const PPB_Graphics3D_Dev* Graphics3D::GetInterface() {
   return &ppb_graphics3d;
 }
 
 Graphics3D* Graphics3D::GetCurrent() {
-  return CurrentContextKey::get()->Get();
+  return g_current_context_key.Get().Get();
 }
 
 void Graphics3D::ResetCurrent() {
-  CurrentContextKey::get()->Set(NULL);
+  g_current_context_key.Get().Set(NULL);
 }
 
 Graphics3D::~Graphics3D() {
   Destroy();
 }
 
 bool Graphics3D::Init(PP_Instance instance_id, int32_t config,
                       const int32_t* attrib_list) {
   PluginInstance* instance = ResourceTracker::Get()->GetInstance(instance_id);
   if (!instance) {
@@ skipping 38 matching lines @@
   }
 
   bound_instance_ = new_instance;
   return true;
 }
 
 bool Graphics3D::MakeCurrent() {
   if (!platform_context_.get())
     return false;
 
-  CurrentContextKey::get()->Set(this);
+  g_current_context_key.Get().Set(this);
 
   // TODO(apatrick): Return false on context lost.
   return true;
 }
 
 bool Graphics3D::SwapBuffers() {
   if (!platform_context_.get())
     return false;
 
   return platform_context_->SwapBuffers();
@@ skipping 32 matching lines @@
     ResetCurrent();
   }
 
   gles2_implementation_ = NULL;
 
   platform_context_.reset();
 }
 
 }  // namespace pepper