3 files changed, 16 insertions, 11 deletions
diff --git a/webkit/glue/plugins/pepper_graphics_3d.cc b/webkit/glue/plugins/pepper_graphics_3d.cc
index 34551da..3a5f129 100644
--- a/webkit/glue/plugins/pepper_graphics_3d.cc
+++ b/webkit/glue/plugins/pepper_graphics_3d.cc
@@ -5,7 +5,7 @@
 #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"
@@ -15,10 +15,8 @@ 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 };
@@ -138,11 +136,11 @@ const PPB_Graphics3D_Dev* Graphics3D::GetInterface() {
 }
 
 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::AsGraphics3D() {
@@ -205,7 +203,7 @@ 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;
diff --git a/webkit/glue/plugins/pepper_resource_tracker.cc b/webkit/glue/plugins/pepper_resource_tracker.cc
index 997ef63..9623e98 100644
--- a/webkit/glue/plugins/pepper_resource_tracker.cc
+++ b/webkit/glue/plugins/pepper_resource_tracker.cc
@@ -7,11 +7,15 @@
 #include <limits>
 #include <set>
 
+#include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "ppapi/c/pp_resource.h"
 #include "webkit/glue/plugins/pepper_resource.h"
 
+static base::LazyInstance<pepper::ResourceTracker> g_resource_tracker(
+    base::LINKER_INITIALIZED);
+
 namespace pepper {
 
 scoped_refptr<Resource> ResourceTracker::GetResource(PP_Resource res) const {
@@ -36,7 +40,7 @@ ResourceTracker::~ResourceTracker() {
 ResourceTracker* ResourceTracker::Get() {
   if (singleton_override_)
     return singleton_override_;
-  return Singleton<ResourceTracker>::get();
+  return g_resource_tracker.Pointer();
 }
 
 PP_Resource ResourceTracker::AddResource(Resource* resource) {
diff --git a/webkit/glue/plugins/pepper_resource_tracker.h b/webkit/glue/plugins/pepper_resource_tracker.h
index 09ff976..0e463b4 100644
--- a/webkit/glue/plugins/pepper_resource_tracker.h
+++ b/webkit/glue/plugins/pepper_resource_tracker.h
@@ -12,11 +12,14 @@
 #include "base/gtest_prod_util.h"
 #include "base/hash_tables.h"
 #include "base/ref_counted.h"
-#include "base/singleton.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_module.h"
 #include "ppapi/c/pp_resource.h"
 
+namespace base {
+template <typename T> struct DefaultLazyInstanceTraits;
+}
+
 namespace pepper {
 
 class PluginInstance;
@@ -91,7 +94,7 @@ class ResourceTracker {
   PluginInstance* GetInstance(PP_Instance instance);
 
  private:
-  friend struct DefaultSingletonTraits<ResourceTracker>;
+  friend struct base::DefaultLazyInstanceTraits<ResourceTracker>;
   friend class Resource;
   friend class ResourceTrackerTest;