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, 4 deletions

diff --git a/chrome/browser/chromeos/browser_main_chromeos.cc b/chrome/browser/chromeos/browser_main_chromeos.cc
index df4653a..776a82b 100644
--- a/chrome/browser/chromeos/browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/browser_main_chromeos.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/chromeos/browser_main_chromeos.h"
 
+#include "base/lazy_instance.h"
 #include "base/message_loop.h"
-#include "base/singleton.h"
 
 #include <gtk/gtk.h>
 
@@ -38,12 +38,13 @@ class MessageLoopObserver : public MessageLoopForUI::Observer {
   }
 };
 
-void BrowserMainPartsChromeos::PostMainMessageLoopStart() {
-  static Singleton<MessageLoopObserver> observer;
+static base::LazyInstance<MessageLoopObserver> g_message_loop_observer(
+    base::LINKER_INITIALIZED);
 
+void BrowserMainPartsChromeos::PostMainMessageLoopStart() {
   BrowserMainPartsPosix::PostMainMessageLoopStart();
   MessageLoopForUI* message_loop = MessageLoopForUI::current();
-  message_loop->AddObserver(observer.get());
+  message_loop->AddObserver(g_message_loop_observer.Pointer());
 }
 
 // static