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, 13 insertions, 14 deletions

diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc
index 45944fc..350ba29 100644
--- a/webkit/glue/webkit_glue.cc
+++ b/webkit/glue/webkit_glue.cc
@@ -11,9 +11,9 @@
 #include <sys/utsname.h>
 #endif
 
-#include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
+#include "base/singleton.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
@@ -356,11 +356,10 @@ struct UserAgentState {
   bool user_agent_is_overridden;
 };
 
-static base::LazyInstance<UserAgentState> g_user_agent(
-    base::LINKER_INITIALIZED);
+Singleton<UserAgentState> g_user_agent;
 
 void SetUserAgentToDefault() {
-  BuildUserAgent(false, &g_user_agent.Get().user_agent);
+  BuildUserAgent(false, &g_user_agent->user_agent);
 }
 
 }  // namespace
@@ -368,31 +367,31 @@ void SetUserAgentToDefault() {
 void SetUserAgent(const std::string& new_user_agent) {
   // If you combine this with the previous line, the function only works the
   // first time.
-  DCHECK(!g_user_agent.Get().user_agent_requested) <<
+  DCHECK(!g_user_agent->user_agent_requested) <<
       "Setting the user agent after someone has "
       "already requested it can result in unexpected behavior.";
-  g_user_agent.Get().user_agent_is_overridden = true;
-  g_user_agent.Get().user_agent = new_user_agent;
+  g_user_agent->user_agent_is_overridden = true;
+  g_user_agent->user_agent = new_user_agent;
 }
 
 const std::string& GetUserAgent(const GURL& url) {
-  if (g_user_agent.Get().user_agent.empty())
+  if (g_user_agent->user_agent.empty())
     SetUserAgentToDefault();
-  g_user_agent.Get().user_agent_requested = true;
-  if (!g_user_agent.Get().user_agent_is_overridden) {
+  g_user_agent->user_agent_requested = true;
+  if (!g_user_agent->user_agent_is_overridden) {
     // Workarounds for sites that use misguided UA sniffing.
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
     if (MatchPattern(url.host(), "*.mail.yahoo.com")) {
       // mail.yahoo.com is ok with Windows Chrome but not Linux Chrome.
       // http://bugs.chromium.org/11136
       // TODO(evanm): remove this if Yahoo fixes their sniffing.
-      if (g_user_agent.Get().mimic_windows_user_agent.empty())
-        BuildUserAgent(true, &g_user_agent.Get().mimic_windows_user_agent);
-      return g_user_agent.Get().mimic_windows_user_agent;
+      if (g_user_agent->mimic_windows_user_agent.empty())
+        BuildUserAgent(true, &g_user_agent->mimic_windows_user_agent);
+      return g_user_agent->mimic_windows_user_agent;
     }
 #endif
   }
-  return g_user_agent.Get().user_agent;
+  return g_user_agent->user_agent;
 }
 
 void SetForcefullyTerminatePluginProcess(bool value) {