Make members of Singleton<T> private and only visible to the singleton type. This enforces that the Singleton<T> pattern can only be used within classes which want singleton-ness.

As part of this CL I have also fixed up files which got missed in my previous CLs to use a GetInstance() method and use Singleton<T> from the source file.

There are a small number of places where I have also switched to LazyInstance as that was more appropriate for types used in a single source file.

BUG=65298
TEST=all existing tests should continue to pass.

Review URL: http://codereview.chromium.org/5682008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68932 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 8 deletions

diff --git a/webkit/appcache/web_application_cache_host_impl.cc b/webkit/appcache/web_application_cache_host_impl.cc
index f65bed6..76c75c19 100644
--- a/webkit/appcache/web_application_cache_host_impl.cc
+++ b/webkit/appcache/web_application_cache_host_impl.cc
@@ -6,9 +6,9 @@
 
 #include "base/compiler_specific.h"
 #include "base/id_map.h"
+#include "base/lazy_instance.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
-#include "base/singleton.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDataSource.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
@@ -29,6 +29,7 @@ namespace appcache {
 namespace {
 
 typedef IDMap<WebApplicationCacheHostImpl> HostsMap;
+static base::LazyInstance<HostsMap> g_hosts_map(base::LINKER_INITIALIZED);
 
 // Note: the order of the elements in this array must match those
 // of the EventID enum in appcache_interfaces.h.
@@ -45,14 +46,10 @@ GURL ClearUrlRef(const GURL& url) {
   return url.ReplaceComponents(replacements);
 }
 
-HostsMap* all_hosts() {
-  return Singleton<HostsMap>::get();
-}
-
 }  // anon namespace
 
 WebApplicationCacheHostImpl* WebApplicationCacheHostImpl::FromId(int id) {
-  return all_hosts()->Lookup(id);
+  return g_hosts_map.Get().Lookup(id);
 }
 
 WebApplicationCacheHostImpl* WebApplicationCacheHostImpl::FromFrame(
@@ -71,7 +68,7 @@ WebApplicationCacheHostImpl::WebApplicationCacheHostImpl(
     AppCacheBackend* backend)
     : client_(client),
       backend_(backend),
-      ALLOW_THIS_IN_INITIALIZER_LIST(host_id_(all_hosts()->Add(this))),
+      ALLOW_THIS_IN_INITIALIZER_LIST(host_id_(g_hosts_map.Get().Add(this))),
       has_status_(false),
       status_(UNCACHED),
       has_cached_status_(false),
@@ -86,7 +83,7 @@ WebApplicationCacheHostImpl::WebApplicationCacheHostImpl(
 
 WebApplicationCacheHostImpl::~WebApplicationCacheHostImpl() {
   backend_->UnregisterHost(host_id_);
-  all_hosts()->Remove(host_id_);
+  g_hosts_map.Get().Remove(host_id_);
 }
 
 void WebApplicationCacheHostImpl::OnCacheSelected(