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@69107 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 2 deletions

diff --git a/chrome/common/sqlite_utils.cc b/chrome/common/sqlite_utils.cc
index d11b925..9d16c7f 100644
--- a/chrome/common/sqlite_utils.cc
+++ b/chrome/common/sqlite_utils.cc
@@ -8,8 +8,8 @@
 
 #include "base/file_path.h"
 #include "base/lock.h"
+#include "base/lazy_instance.h"
 #include "base/logging.h"
-#include "base/singleton.h"
 #include "base/stl_util-inl.h"
 #include "base/string16.h"
 
@@ -76,10 +76,13 @@ class DefaultSQLErrorHandlerFactory : public SQLErrorHandlerFactory {
   Lock lock_;
 };
 
+static base::LazyInstance<DefaultSQLErrorHandlerFactory>
+    g_default_sql_error_handler_factory(base::LINKER_INITIALIZED);
+
 SQLErrorHandlerFactory* GetErrorHandlerFactory() {
   // TODO(cpu): Testing needs to override the error handler.
   // Destruction of DefaultSQLErrorHandlerFactory handled by at_exit manager.
-  return Singleton<DefaultSQLErrorHandlerFactory>::get();
+  return g_default_sql_error_handler_factory.Pointer();
 }
 
 namespace sqlite_utils {