Revert 68932 - 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

TBR=satish@chromium.org
Review URL: http://codereview.chromium.org/5721005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68936 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 16 insertions, 28 deletions

diff --git a/chrome/renderer/extensions/bindings_utils.cc b/chrome/renderer/extensions/bindings_utils.cc
index 4776966..5b213c4 100644
--- a/chrome/renderer/extensions/bindings_utils.cc
+++ b/chrome/renderer/extensions/bindings_utils.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/renderer/extensions/bindings_utils.h"
 
-#include "base/lazy_instance.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "chrome/renderer/render_view.h"
@@ -22,14 +21,11 @@ struct SingletonData {
   ContextList contexts;
   PendingRequestMap pending_requests;
 };
-static base::LazyInstance<SingletonData> g_singleton_data(
-    base::LINKER_INITIALIZED);
 
 typedef std::map<int, std::string> StringMap;
-static base::LazyInstance<StringMap> g_string_map(base::LINKER_INITIALIZED);
 
 const char* GetStringResource(int resource_id) {
-  StringMap* strings = g_string_map.Pointer();
+  StringMap* strings = Singleton<StringMap>::get();
   StringMap::iterator it = strings->find(resource_id);
   if (it == strings->end()) {
     it = strings->insert(std::make_pair(
@@ -88,7 +84,7 @@ ContextInfo::ContextInfo(v8::Persistent<v8::Context> context,
 ContextInfo::~ContextInfo() {}
 
 ContextList& GetContexts() {
-  return g_singleton_data.Get().contexts;
+  return Singleton<SingletonData>::get()->contexts;
 }
 
 ContextList GetContextsForExtension(const std::string& extension_id) {
@@ -138,7 +134,7 @@ ContextList::iterator FindContext(v8::Handle<v8::Context> context) {
 }
 
 PendingRequestMap& GetPendingRequestMap() {
-  return g_singleton_data.Get().pending_requests;
+  return Singleton<SingletonData>::get()->pending_requests;
 }
 
 RenderView* GetRenderViewForCurrentContext() {
diff --git a/chrome/renderer/extensions/renderer_extension_bindings.cc b/chrome/renderer/extensions/renderer_extension_bindings.cc
index ab7a8eb..9555672 100644
--- a/chrome/renderer/extensions/renderer_extension_bindings.cc
+++ b/chrome/renderer/extensions/renderer_extension_bindings.cc
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/lazy_instance.h"
+#include "base/singleton.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension_message_bundle.h"
 #include "chrome/common/render_messages.h"
@@ -43,20 +43,17 @@ struct ExtensionData {
   std::map<int, PortData> ports;  // port ID -> data
 };
 
-static base::LazyInstance<ExtensionData> g_extension_data(
-    base::LINKER_INITIALIZED);
-
 static bool HasPortData(int port_id) {
-  return g_extension_data.Get().ports.find(port_id) !=
-      g_extension_data.Get().ports.end();
+  return Singleton<ExtensionData>::get()->ports.find(port_id) !=
+      Singleton<ExtensionData>::get()->ports.end();
 }
 
 static ExtensionData::PortData& GetPortData(int port_id) {
-  return g_extension_data.Get().ports[port_id];
+  return Singleton<ExtensionData>::get()->ports[port_id];
 }
 
 static void ClearPortData(int port_id) {
-  g_extension_data.Get().ports.erase(port_id);
+  Singleton<ExtensionData>::get()->ports.erase(port_id);
 }
 
 const char kPortClosedError[] = "Attempting to use a disconnected port object";
diff --git a/chrome/renderer/ggl/ggl.cc b/chrome/renderer/ggl/ggl.cc
index c95bbb5..577e853 100644
--- a/chrome/renderer/ggl/ggl.cc
+++ b/chrome/renderer/ggl/ggl.cc
@@ -4,8 +4,8 @@
 
 #include "build/build_config.h"
 
-#include "base/lazy_instance.h"
 #include "base/ref_counted.h"
+#include "base/singleton.h"
 #include "base/weak_ptr.h"
 #include "chrome/renderer/command_buffer_proxy.h"
 #include "chrome/renderer/ggl/ggl.h"
@@ -48,10 +48,6 @@ class GLES2Initializer {
  private:
   DISALLOW_COPY_AND_ASSIGN(GLES2Initializer);
 };
-
-static base::LazyInstance<GLES2Initializer> g_gles2_initializer(
-    base::LINKER_INITIALIZED);
-
 }  // namespace anonymous
 
 // Manages a GL context.
@@ -167,7 +163,7 @@ bool Context::Initialize(gfx::NativeViewId view,
     return false;
 
   // Ensure the gles2 library is initialized first in a thread safe way.
-  g_gles2_initializer.Get();
+  Singleton<GLES2Initializer>::get();
 
   // Allocate a frame buffer ID with respect to the parent.
   if (parent_.get()) {
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index ca29c0a..e29e30a 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -15,10 +15,10 @@
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
-#include "base/lazy_instance.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
+#include "base/singleton.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
@@ -277,7 +277,6 @@ using webkit_glue::WebAccessibility;
 //-----------------------------------------------------------------------------
 
 typedef std::map<WebKit::WebView*, RenderView*> ViewMap;
-static base::LazyInstance<ViewMap> g_view_map(base::LINKER_INITIALIZED);
 
 // define to write the time necessary for thumbnail/DOM text retrieval,
 // respectively, into the system debug log
@@ -616,7 +615,7 @@ RenderView::~RenderView() {
 
 #ifndef NDEBUG
   // Make sure we are no longer referenced by the ViewMap.
-  ViewMap* views = g_view_map.Pointer();
+  ViewMap* views = Singleton<ViewMap>::get();
   for (ViewMap::iterator it = views->begin(); it != views->end(); ++it)
     DCHECK_NE(this, it->second) << "Failed to call Close?";
 #endif
@@ -624,7 +623,7 @@ RenderView::~RenderView() {
 
 /*static*/
 void RenderView::ForEach(RenderViewVisitor* visitor) {
-  ViewMap* views = g_view_map.Pointer();
+  ViewMap* views = Singleton<ViewMap>::get();
   for (ViewMap::iterator it = views->begin(); it != views->end(); ++it) {
     if (!visitor->Visit(it->second))
       return;
@@ -633,7 +632,7 @@ void RenderView::ForEach(RenderViewVisitor* visitor) {
 
 /*static*/
 RenderView* RenderView::FromWebView(WebView* webview) {
-  ViewMap* views = g_view_map.Pointer();
+  ViewMap* views = Singleton<ViewMap>::get();
   ViewMap::iterator it = views->find(webview);
   return it == views->end() ? NULL : it->second;
 }
@@ -896,7 +895,7 @@ void RenderView::Init(gfx::NativeViewId parent_hwnd,
   devtools_agent_.reset(new DevToolsAgent(routing_id, this));
 
   webwidget_ = WebView::create(this, devtools_agent_.get());
-  g_view_map.Get().insert(std::make_pair(webview(), this));
+  Singleton<ViewMap>::get()->insert(std::make_pair(webview(), this));
   webkit_preferences_.Apply(webview());
   webview()->initializeMainFrame(this);
   if (!frame_name.empty())
@@ -5448,7 +5447,7 @@ void RenderView::Close() {
   // We need to grab a pointer to the doomed WebView before we destroy it.
   WebView* doomed = webview();
   RenderWidget::Close();
-  g_view_map.Get().erase(doomed);
+  Singleton<ViewMap>::get()->erase(doomed);
 }
 
 void RenderView::DidHandleKeyEvent() {