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

1 files changed, 7 insertions, 5 deletions

diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc
index bb77108..87a4772 100644
--- a/chrome/plugin/webplugin_proxy.cc
+++ b/chrome/plugin/webplugin_proxy.cc
@@ -9,13 +9,13 @@
 #if defined(OS_WIN)
 #include "app/win_util.h"
 #endif
-#include "base/lazy_instance.h"
 #if defined(OS_MACOSX)
 #include "base/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #endif
 #include "base/scoped_handle.h"
 #include "base/shared_memory.h"
+#include "base/singleton.h"
 #include "build/build_config.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/plugin_messages.h"
@@ -47,7 +47,9 @@ using webkit_glue::WebPluginAcceleratedSurface;
 #endif
 
 typedef std::map<CPBrowsingContext, WebPluginProxy*> ContextMap;
-static base::LazyInstance<ContextMap> g_context_map(base::LINKER_INITIALIZED);
+static ContextMap& GetContextMap() {
+  return *Singleton<ContextMap>::get();
+}
 
 WebPluginProxy::WebPluginProxy(
     PluginChannel* channel,
@@ -91,7 +93,7 @@ WebPluginProxy::WebPluginProxy(
 
 WebPluginProxy::~WebPluginProxy() {
   if (cp_browsing_context_)
-    g_context_map.Get().erase(cp_browsing_context_);
+    GetContextMap().erase(cp_browsing_context_);
 
 #if defined(USE_X11)
   if (windowless_shm_pixmap_ != None)
@@ -269,14 +271,14 @@ CPBrowsingContext WebPluginProxy::GetCPBrowsingContext() {
   if (cp_browsing_context_ == 0) {
     Send(new PluginHostMsg_GetCPBrowsingContext(route_id_,
                                                 &cp_browsing_context_));
-    g_context_map.Get()[cp_browsing_context_] = this;
+    GetContextMap()[cp_browsing_context_] = this;
   }
   return cp_browsing_context_;
 }
 
 WebPluginProxy* WebPluginProxy::FromCPBrowsingContext(
     CPBrowsingContext context) {
-  return g_context_map.Get()[context];
+  return GetContextMap()[context];
 }
 
 WebPluginResourceClient* WebPluginProxy::GetResourceClient(int id) {