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

chrome/renderer/ggl/ggl.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 "build/build_config.h"
 
+#include "base/lazy_instance.h"
 #include "base/ref_counted.h"
-#include "base/singleton.h"
 #include "base/weak_ptr.h"
 #include "chrome/renderer/command_buffer_proxy.h"
 #include "chrome/renderer/ggl/ggl.h"
 #include "chrome/renderer/gpu_channel_host.h"
 #include "chrome/renderer/gpu_video_service_host.h"
 #include "chrome/renderer/media/gles2_video_decode_context.h"
 #include "chrome/renderer/render_widget.h"
 #include "ipc/ipc_channel_handle.h"
 
 #if defined(ENABLE_GPU)
@@ skipping 22 matching lines @@
     gles2::Initialize();
   }
 
   ~GLES2Initializer() {
     gles2::Terminate();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GLES2Initializer);
 };
+
+static base::LazyInstance<GLES2Initializer> g_gles2_initializer(
+    base::LINKER_INITIALIZED);
+
 }  // namespace anonymous
 
 // Manages a GL context.
 class Context : public base::SupportsWeakPtr<Context> {
  public:
   Context(GpuChannelHost* channel, Context* parent);
   ~Context();
 
   // Initialize a GGL context that can be used in association with a a GPU
   // channel acquired from a RenderWidget or RenderView.
@@ skipping 95 matching lines @@
                          int render_view_id,
                          const gfx::Size& size,
                          const char* allowed_extensions,
                          const int32* attrib_list) {
   DCHECK(size.width() >= 0 && size.height() >= 0);
 
   if (channel_->state() != GpuChannelHost::kConnected)
     return false;
 
   // Ensure the gles2 library is initialized first in a thread safe way.
-  Singleton<GLES2Initializer>::get();
+  g_gles2_initializer.Get();
 
   // Allocate a frame buffer ID with respect to the parent.
   if (parent_.get()) {
     // Flush any remaining commands in the parent context to make sure the
     // texture id accounting stays consistent.
     int32 token = parent_->gles2_helper_->InsertToken();
     parent_->gles2_helper_->WaitForToken(token);
     parent_texture_id_ = parent_->gles2_implementation_->MakeTextureId();
   }
 
@@ skipping 385 matching lines @@
 }
 
 gpu::gles2::GLES2Implementation* GetImplementation(Context* context) {
   if (!context)
     return NULL;
 
   return context->gles2_implementation();
 }
 
 }  // namespace ggl