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

webkit/glue/plugins/pepper_resource_tracker.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_resource_tracker.h"
 
 #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 {
   ResourceMap::const_iterator result = live_resources_.find(res);
   if (result == live_resources_.end()) {
     return scoped_refptr<Resource>();
   }
   return result->second.first;
 }
 
 // static
 ResourceTracker* ResourceTracker::singleton_override_ = NULL;
 
 ResourceTracker::ResourceTracker()
     : last_id_(0) {
 }
 
 ResourceTracker::~ResourceTracker() {
 }
 
 // static
 ResourceTracker* ResourceTracker::Get() {
   if (singleton_override_)
     return singleton_override_;
-  return Singleton<ResourceTracker>::get();
+  return g_resource_tracker.Pointer();
 }
 
 PP_Resource ResourceTracker::AddResource(Resource* resource) {
   // If the plugin manages to create 4B resources...
   if (last_id_ == std::numeric_limits<PP_Resource>::max()) {
     return 0;
   }
   // Add the resource with plugin use-count 1.
   ++last_id_;
   live_resources_.insert(std::make_pair(last_id_, std::make_pair(resource, 1)));
@@ skipping 130 matching lines @@
   singleton_override_ = tracker;
 }
 
 // static
 void ResourceTracker::ClearSingletonOverride() {
   DCHECK(singleton_override_);
   singleton_override_ = NULL;
 }
 
 }  // namespace pepper