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

diff --git a/chrome_frame/external_tab.cc b/chrome_frame/external_tab.cc
index ef5fe8c..785b189 100644
--- a/chrome_frame/external_tab.cc
+++ b/chrome_frame/external_tab.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "chrome_frame/external_tab.h"
-#include "base/singleton.h"
+#include "base/lazy_instance.h"
 #include "base/tracked.h"
 #include "base/task.h"
 #include "base/waitable_event.h"
@@ -15,7 +15,8 @@ DISABLE_RUNNABLE_METHOD_REFCOUNT(ExternalTabProxy);
 DISABLE_RUNNABLE_METHOD_REFCOUNT(UIDelegate);
 
 namespace {
-  Singleton<ChromeProxyFactory> g_proxy_factory;
+  static base::LazyInstance<ChromeProxyFactory> g_proxy_factory(
+      base::LINKER_INITIALIZED);
 
   struct UserDataHolder : public SyncMessageContext {
     explicit UserDataHolder(void* p) : data(p) {}
@@ -25,7 +26,7 @@ namespace {
 
 
 ExternalTabProxy::ExternalTabProxy() : state_(NONE), tab_(0), tab_wnd_(NULL),
-    chrome_wnd_(NULL), proxy_factory_(g_proxy_factory.get()), proxy_(NULL),
+    chrome_wnd_(NULL), proxy_factory_(g_proxy_factory.Pointer()), proxy_(NULL),
     ui_delegate_(NULL) {
 }