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

chrome/common/sqlite_utils.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 "chrome/common/sqlite_utils.h"
 
 #include <list>
 
 #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"
 
 // The vanilla error handler implements the common fucntionality for all the
 // error handlers. Specialized error handlers are expected to only override
 // the Handler() function.
 class VanillaSQLErrorHandler : public SQLErrorHandler {
  public:
   VanillaSQLErrorHandler() : error_(SQLITE_OK) {
   }
@@ skipping 46 matching lines @@
   void AddHandler(SQLErrorHandler* handler) {
     AutoLock lock(lock_);
     errors_.push_back(handler);
   }
 
   typedef std::list<SQLErrorHandler*> ErrorList;
   ErrorList errors_;
   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 {
 
 int OpenSqliteDb(const FilePath& filepath, sqlite3** database) {
 #if defined(OS_WIN)
   // We want the default encoding to always be UTF-8, so we use the
   // 8-bit version of open().
   return sqlite3_open(WideToUTF8(filepath.value()).c_str(), database);
 #elif defined(OS_POSIX)
@@ skipping 405 matching lines @@
   const char* s = column_text(index);
   str->assign(s ? UTF8ToWide(s) : std::wstring());
   return (s != NULL);
 }
 
 std::wstring SQLStatement::column_wstring(int index) {
   std::wstring wstr;
   column_wstring(index, &wstr);
   return wstr;
 }