Move Singleton and related structs to namespace base

Public APIs from base should live inside base:: so moved Singleton class
and structs to base{} and fixed consumers.

also fixed:

** Presubmit ERRORS **
Found Singleton<T> in the following header files.
Please move them to an appropriate source file so that the template
gets instantiated in a single compilation unit.
  chrome/browser/plugins/plugin_finder.h \
  chromecast/media/base/media_message_loop.h \
  content/browser/media/android/media_drm_credential_manager.h

Presubmit warnings:
src/chrome/browser/extensions/warning_badge_service_factory.h:5:
  #ifndef header guard has wrong style, please use:
  CHROME_BROWSER_EXTENSIONS_WARNING_BADGE_SERVICE_FACTORY_H_
  [build/header_guard] [5]
src/chrome/browser/extensions/warning_badge_service_factory.h:39:
  #endif line should be "#endif  //
  CHROME_BROWSER_EXTENSIONS_WARNING_BADGE_SERVICE_FACTORY_H_"
  [build/header_guard] [5]

TBR=jam@chromium.org

Review URL: https://codereview.chromium.org/1308823002

Cr-Commit-Position: refs/heads/master@{#348136}

19 files changed, 38 insertions, 27 deletions

diff --git a/net/base/openssl_private_key_store_memory.cc b/net/base/openssl_private_key_store_memory.cc
index 5f939d4..e258eb5 100644
--- a/net/base/openssl_private_key_store_memory.cc
+++ b/net/base/openssl_private_key_store_memory.cc
@@ -24,7 +24,7 @@ class MemoryKeyPairStore {
   MemoryKeyPairStore() {}
 
   static MemoryKeyPairStore* GetInstance() {
-    return Singleton<MemoryKeyPairStore>::get();
+    return base::Singleton<MemoryKeyPairStore>::get();
   }
 
   ~MemoryKeyPairStore() {
diff --git a/net/cert/cert_database.cc b/net/cert/cert_database.cc
index 8591122..7b85fc7 100644
--- a/net/cert/cert_database.cc
+++ b/net/cert/cert_database.cc
@@ -13,7 +13,8 @@ namespace net {
 CertDatabase* CertDatabase::GetInstance() {
   // Leaky so it can be initialized on worker threads, and because there is no
   // useful cleanup to do.
-  return Singleton<CertDatabase, LeakySingletonTraits<CertDatabase> >::get();
+  return base::Singleton<CertDatabase,
+                         base::LeakySingletonTraits<CertDatabase>>::get();
 }
 
 void CertDatabase::AddObserver(Observer* observer) {
diff --git a/net/cert/cert_database.h b/net/cert/cert_database.h
index 64f5069..8b9b82e 100644
--- a/net/cert/cert_database.h
+++ b/net/cert/cert_database.h
@@ -11,9 +11,9 @@
 #include "net/base/net_export.h"
 #include "net/cert/x509_certificate.h"
 
+namespace base {
 template <typename T> struct DefaultSingletonTraits;
 
-namespace base {
 template <class ObserverType>
 class ObserverListThreadSafe;
 }
@@ -105,7 +105,7 @@ class NET_EXPORT CertDatabase {
   void NotifyObserversOfCACertChanged(const X509Certificate* cert);
 
  private:
-  friend struct DefaultSingletonTraits<CertDatabase>;
+  friend struct base::DefaultSingletonTraits<CertDatabase>;
 
   CertDatabase();
   ~CertDatabase();
diff --git a/net/cert/x509_certificate_openssl.cc b/net/cert/x509_certificate_openssl.cc
index 0d92a83..6e80361 100644
--- a/net/cert/x509_certificate_openssl.cc
+++ b/net/cert/x509_certificate_openssl.cc
@@ -142,8 +142,8 @@ class X509InitSingleton {
     // We allow the X509 store to leak, because it is used from a non-joinable
     // worker that is not stopped on shutdown, hence may still be using
     // OpenSSL library after the AtExit runner has completed.
-    return Singleton<X509InitSingleton,
-                     LeakySingletonTraits<X509InitSingleton> >::get();
+    return base::Singleton<X509InitSingleton, base::LeakySingletonTraits<
+                                                  X509InitSingleton>>::get();
   }
   X509_STORE* store() const { return store_.get(); }
 
@@ -155,7 +155,7 @@ class X509InitSingleton {
   }
 
  private:
-  friend struct DefaultSingletonTraits<X509InitSingleton>;
+  friend struct base::DefaultSingletonTraits<X509InitSingleton>;
   X509InitSingleton() {
     crypto::EnsureOpenSSLInit();
     ResetCertStore();
diff --git a/net/ftp/ftp_util.cc b/net/ftp/ftp_util.cc
index 44fe98b..2f1df69 100644
--- a/net/ftp/ftp_util.cc
+++ b/net/ftp/ftp_util.cc
@@ -132,7 +132,7 @@ namespace {
 class AbbreviatedMonthsMap {
  public:
   static AbbreviatedMonthsMap* GetInstance() {
-    return Singleton<AbbreviatedMonthsMap>::get();
+    return base::Singleton<AbbreviatedMonthsMap>::get();
   }
 
   // Converts abbreviated month name |text| to its number (in range 1-12).
@@ -150,7 +150,7 @@ class AbbreviatedMonthsMap {
   }
 
  private:
-  friend struct DefaultSingletonTraits<AbbreviatedMonthsMap>;
+  friend struct base::DefaultSingletonTraits<AbbreviatedMonthsMap>;
 
   // Constructor, initializes the map based on ICU data. It is much faster
   // to do that just once.
diff --git a/net/proxy/in_process_mojo_proxy_resolver_factory.cc b/net/proxy/in_process_mojo_proxy_resolver_factory.cc
index dfd9e7b..3e58b01 100644
--- a/net/proxy/in_process_mojo_proxy_resolver_factory.cc
+++ b/net/proxy/in_process_mojo_proxy_resolver_factory.cc
@@ -12,7 +12,7 @@ namespace net {
 // static
 InProcessMojoProxyResolverFactory*
 InProcessMojoProxyResolverFactory::GetInstance() {
-  return Singleton<InProcessMojoProxyResolverFactory>::get();
+  return base::Singleton<InProcessMojoProxyResolverFactory>::get();
 }
 
 InProcessMojoProxyResolverFactory::InProcessMojoProxyResolverFactory() {
diff --git a/net/proxy/in_process_mojo_proxy_resolver_factory.h b/net/proxy/in_process_mojo_proxy_resolver_factory.h
index f130dca..c6ee223 100644
--- a/net/proxy/in_process_mojo_proxy_resolver_factory.h
+++ b/net/proxy/in_process_mojo_proxy_resolver_factory.h
@@ -8,8 +8,10 @@
 #include "base/macros.h"
 #include "net/proxy/mojo_proxy_resolver_factory.h"
 
+namespace base {
 template <typename T>
 struct DefaultSingletonTraits;
+}
 
 namespace net {
 
@@ -29,7 +31,7 @@ class InProcessMojoProxyResolverFactory : public MojoProxyResolverFactory {
  private:
   InProcessMojoProxyResolverFactory();
   ~InProcessMojoProxyResolverFactory() override;
-  friend struct DefaultSingletonTraits<InProcessMojoProxyResolverFactory>;
+  friend struct base::DefaultSingletonTraits<InProcessMojoProxyResolverFactory>;
 
   interfaces::ProxyResolverFactoryPtr factory_;
 
diff --git a/net/quic/crypto/common_cert_set.cc b/net/quic/crypto/common_cert_set.cc
index 1a78f1b..d4603c7 100644
--- a/net/quic/crypto/common_cert_set.cc
+++ b/net/quic/crypto/common_cert_set.cc
@@ -137,14 +137,14 @@ class CommonCertSetsQUIC : public CommonCertSets {
   }
 
   static CommonCertSetsQUIC* GetInstance() {
-    return Singleton<CommonCertSetsQUIC>::get();
+    return base::Singleton<CommonCertSetsQUIC>::get();
   }
 
  private:
   CommonCertSetsQUIC() {}
   ~CommonCertSetsQUIC() override {}
 
-  friend struct DefaultSingletonTraits<CommonCertSetsQUIC>;
+  friend struct base::DefaultSingletonTraits<CommonCertSetsQUIC>;
   DISALLOW_COPY_AND_ASSIGN(CommonCertSetsQUIC);
 };
 
diff --git a/net/quic/crypto/quic_random.cc b/net/quic/crypto/quic_random.cc
index 6b34465..941b389 100644
--- a/net/quic/crypto/quic_random.cc
+++ b/net/quic/crypto/quic_random.cc
@@ -25,12 +25,12 @@ class DefaultRandom : public QuicRandom {
   DefaultRandom() {};
   ~DefaultRandom() override {}
 
-  friend struct DefaultSingletonTraits<DefaultRandom>;
+  friend struct base::DefaultSingletonTraits<DefaultRandom>;
   DISALLOW_COPY_AND_ASSIGN(DefaultRandom);
 };
 
 DefaultRandom* DefaultRandom::GetInstance() {
-  return Singleton<DefaultRandom>::get();
+  return base::Singleton<DefaultRandom>::get();
 }
 
 void DefaultRandom::RandBytes(void* data, size_t len) {
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc
index ac0f0912..171bd36 100644
--- a/net/socket/ssl_client_socket_openssl.cc
+++ b/net/socket/ssl_client_socket_openssl.cc
@@ -200,7 +200,9 @@ base::LazyInstance<PlatformKeyTaskRunner>::Leaky g_platform_key_task_runner =
 
 class SSLClientSocketOpenSSL::SSLContext {
  public:
-  static SSLContext* GetInstance() { return Singleton<SSLContext>::get(); }
+  static SSLContext* GetInstance() {
+    return base::Singleton<SSLContext>::get();
+  }
   SSL_CTX* ssl_ctx() { return ssl_ctx_.get(); }
   SSLClientSessionCacheOpenSSL* session_cache() { return &session_cache_; }
 
@@ -219,7 +221,7 @@ class SSLClientSocketOpenSSL::SSLContext {
   static const SSL_PRIVATE_KEY_METHOD kPrivateKeyMethod;
 
  private:
-  friend struct DefaultSingletonTraits<SSLContext>;
+  friend struct base::DefaultSingletonTraits<SSLContext>;
 
   SSLContext() : session_cache_(SSLClientSessionCacheOpenSSL::Config()) {
     crypto::EnsureOpenSSLInit();
diff --git a/net/socket/websocket_endpoint_lock_manager.cc b/net/socket/websocket_endpoint_lock_manager.cc
index 8a218df..42dab82 100644
--- a/net/socket/websocket_endpoint_lock_manager.cc
+++ b/net/socket/websocket_endpoint_lock_manager.cc
@@ -33,7 +33,7 @@ WebSocketEndpointLockManager::Waiter::~Waiter() {
 }
 
 WebSocketEndpointLockManager* WebSocketEndpointLockManager::GetInstance() {
-  return Singleton<WebSocketEndpointLockManager>::get();
+  return base::Singleton<WebSocketEndpointLockManager>::get();
 }
 
 int WebSocketEndpointLockManager::LockEndpoint(const IPEndPoint& endpoint,
diff --git a/net/socket/websocket_endpoint_lock_manager.h b/net/socket/websocket_endpoint_lock_manager.h
index bddd545..f3887b8 100644
--- a/net/socket/websocket_endpoint_lock_manager.h
+++ b/net/socket/websocket_endpoint_lock_manager.h
@@ -146,7 +146,7 @@ class NET_EXPORT_PRIVATE WebSocketEndpointLockManager {
   // object.
   base::WeakPtrFactory<WebSocketEndpointLockManager> weak_factory_;
 
-  friend struct DefaultSingletonTraits<WebSocketEndpointLockManager>;
+  friend struct base::DefaultSingletonTraits<WebSocketEndpointLockManager>;
 
   DISALLOW_COPY_AND_ASSIGN(WebSocketEndpointLockManager);
 };
diff --git a/net/spdy/hpack/hpack_constants.cc b/net/spdy/hpack/hpack_constants.cc
index 28385f9..59a55da 100644
--- a/net/spdy/hpack/hpack_constants.cc
+++ b/net/spdy/hpack/hpack_constants.cc
@@ -29,7 +29,7 @@ struct SharedHpackHuffmanTable {
   }
 
   static SharedHpackHuffmanTable* GetInstance() {
-    return Singleton<SharedHpackHuffmanTable>::get();
+    return base::Singleton<SharedHpackHuffmanTable>::get();
   }
 
   scoped_ptr<const HpackHuffmanTable> table;
@@ -48,7 +48,7 @@ struct SharedHpackStaticTable {
   }
 
   static SharedHpackStaticTable* GetInstance() {
-    return Singleton<SharedHpackStaticTable>::get();
+    return base::Singleton<SharedHpackStaticTable>::get();
   }
 
   scoped_ptr<const HpackStaticTable> table;
diff --git a/net/ssl/openssl_client_key_store.cc b/net/ssl/openssl_client_key_store.cc
index 0bc97be..de1199f 100644
--- a/net/ssl/openssl_client_key_store.cc
+++ b/net/ssl/openssl_client_key_store.cc
@@ -117,7 +117,7 @@ void OpenSSLClientKeyStore::Flush() {
 }
 
 OpenSSLClientKeyStore* OpenSSLClientKeyStore::GetInstance() {
-  return Singleton<OpenSSLClientKeyStore>::get();
+  return base::Singleton<OpenSSLClientKeyStore>::get();
 }
 
 }  // namespace net
diff --git a/net/ssl/openssl_client_key_store.h b/net/ssl/openssl_client_key_store.h
index bba19a3..16904ef 100644
--- a/net/ssl/openssl_client_key_store.h
+++ b/net/ssl/openssl_client_key_store.h
@@ -90,7 +90,7 @@ class NET_EXPORT OpenSSLClientKeyStore {
 
   std::vector<KeyPair> pairs_;
 
-  friend struct DefaultSingletonTraits<OpenSSLClientKeyStore>;
+  friend struct base::DefaultSingletonTraits<OpenSSLClientKeyStore>;
 
   DISALLOW_COPY_AND_ASSIGN(OpenSSLClientKeyStore);
 };
diff --git a/net/tools/quic/quic_in_memory_cache.cc b/net/tools/quic/quic_in_memory_cache.cc
index 13788bf..2ae5c49 100644
--- a/net/tools/quic/quic_in_memory_cache.cc
+++ b/net/tools/quic/quic_in_memory_cache.cc
@@ -27,7 +27,7 @@ QuicInMemoryCache::Response::~Response() {}
 
 // static
 QuicInMemoryCache* QuicInMemoryCache::GetInstance() {
-  return Singleton<QuicInMemoryCache>::get();
+  return base::Singleton<QuicInMemoryCache>::get();
 }
 
 const QuicInMemoryCache::Response* QuicInMemoryCache::GetResponse(
diff --git a/net/tools/quic/quic_in_memory_cache.h b/net/tools/quic/quic_in_memory_cache.h
index e10e02d..e96ad01 100644
--- a/net/tools/quic/quic_in_memory_cache.h
+++ b/net/tools/quic/quic_in_memory_cache.h
@@ -12,8 +12,12 @@
 #include "base/strings/string_piece.h"
 #include "net/spdy/spdy_framer.h"
 
+namespace base {
+
 template <typename Type> struct DefaultSingletonTraits;
 
+}  // namespace base
+
 namespace net {
 namespace tools {
 
@@ -99,7 +103,7 @@ class QuicInMemoryCache {
  private:
   typedef base::hash_map<std::string, Response*> ResponseMap;
 
-  friend struct DefaultSingletonTraits<QuicInMemoryCache>;
+  friend struct base::DefaultSingletonTraits<QuicInMemoryCache>;
   friend class test::QuicInMemoryCachePeer;
 
   QuicInMemoryCache();
diff --git a/net/url_request/url_request_job_manager.cc b/net/url_request/url_request_job_manager.cc
index 39c21b7..092708f 100644
--- a/net/url_request/url_request_job_manager.cc
+++ b/net/url_request/url_request_job_manager.cc
@@ -41,7 +41,7 @@ static const SchemeToFactory kBuiltinFactories[] = {
 
 // static
 URLRequestJobManager* URLRequestJobManager::GetInstance() {
-  return Singleton<URLRequestJobManager>::get();
+  return base::Singleton<URLRequestJobManager>::get();
 }
 
 URLRequestJob* URLRequestJobManager::CreateJob(
diff --git a/net/url_request/url_request_job_manager.h b/net/url_request/url_request_job_manager.h
index 7729abb..422a982 100644
--- a/net/url_request/url_request_job_manager.h
+++ b/net/url_request/url_request_job_manager.h
@@ -11,7 +11,9 @@
 #include "net/base/net_export.h"
 #include "net/url_request/url_request.h"
 
+namespace base {
 template <typename T> struct DefaultSingletonTraits;
+}  // namespace base
 
 namespace net {
 
@@ -51,7 +53,7 @@ class NET_EXPORT URLRequestJobManager {
   static bool SupportsScheme(const std::string& scheme);
 
  private:
-  friend struct DefaultSingletonTraits<URLRequestJobManager>;
+  friend struct base::DefaultSingletonTraits<URLRequestJobManager>;
 
   URLRequestJobManager();
   ~URLRequestJobManager();