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

chrome/browser/chromeos/login/signed_settings_helper.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/browser/chromeos/login/signed_settings_helper.h"
 
 #include <string>
 #include <vector>
 
+#include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/ref_counted.h"
-#include "base/singleton.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/chromeos/login/signed_settings.h"
 
 namespace chromeos {
 
 namespace {
 
 class OpContext {
  public:
   class Delegate {
@@ skipping 279 matching lines @@
 
  private:
   SignedSettingsHelperImpl();
   ~SignedSettingsHelperImpl();
 
   void AddOpContext(OpContext* context);
   void ClearAll();
 
   std::vector<OpContext*> pending_contexts_;
 
-  friend struct DefaultSingletonTraits<SignedSettingsHelperImpl>;
+  friend struct base::DefaultLazyInstanceTraits<SignedSettingsHelperImpl>;
   DISALLOW_COPY_AND_ASSIGN(SignedSettingsHelperImpl);
 };
 
+static base::LazyInstance<SignedSettingsHelperImpl>

[M-A Ruel, 2010/12/10 14:52:18]

I highly prefer to not make these file local static.

+    g_signed_settings_helper_impl(base::LINKER_INITIALIZED);
+
 SignedSettingsHelperImpl::SignedSettingsHelperImpl() {
 }
 
 SignedSettingsHelperImpl::~SignedSettingsHelperImpl() {
   if (!pending_contexts_.empty()) {
     LOG(WARNING) << "SignedSettingsHelperImpl shutdown with pending ops, "
                  << "changes will be lost.";
     ClearAll();
   }
 }
@@ skipping 85 matching lines @@
 
   pending_contexts_.erase(pending_contexts_.begin());
   if (!pending_contexts_.empty())
     pending_contexts_.front()->Execute();
 
   if (test_delegate_)
     test_delegate_->OnOpCompleted(context->op());
 }
 
 SignedSettingsHelper* SignedSettingsHelper::Get() {
-  return Singleton<SignedSettingsHelperImpl>::get();
+  return g_signed_settings_helper_impl.Pointer();
 }
 
 }  // namespace chromeos