Access singletons with a new GetInstance() method instead of Singleton<T>.

net/base/net_util.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/net_util.h"
 
 #include <algorithm>
 #include <map>
 #include <unicode/regex.h>
 #include <unicode/ucnv.h>
@@ skipping 495 matching lines @@
   // An alternative is negative-listing (languages using Greek and
   // Cyrillic letters), but it can be more dangerous.
   return !lang.substr(0, 2).compare("zh") ||
          !lang.substr(0, 2).compare("ja") ||
          !lang.substr(0, 2).compare("ko");
 }
 
 typedef std::map<std::string, icu::UnicodeSet*> LangToExemplarSetMap;
 
 class LangToExemplarSet {
+ public:
+  static LangToExemplarSet* GetInstance() {
+    return Singleton<LangToExemplarSet>::get();
+  }
+
  private:
   LangToExemplarSetMap map;
   LangToExemplarSet() { }
   ~LangToExemplarSet() {
     STLDeleteContainerPairSecondPointers(map.begin(), map.end());
   }
 
   friend class Singleton<LangToExemplarSet>;
   friend struct DefaultSingletonTraits<LangToExemplarSet>;
   friend bool GetExemplarSetForLang(const std::string&, icu::UnicodeSet**);
   friend void SetExemplarSetForLang(const std::string&, icu::UnicodeSet*);
 
   DISALLOW_COPY_AND_ASSIGN(LangToExemplarSet);
 };
 
 bool GetExemplarSetForLang(const std::string& lang,
                            icu::UnicodeSet** lang_set) {
-  const LangToExemplarSetMap& map = Singleton<LangToExemplarSet>()->map;
+  const LangToExemplarSetMap& map = LangToExemplarSet::GetInstance()->map;
   LangToExemplarSetMap::const_iterator pos = map.find(lang);
   if (pos != map.end()) {
     *lang_set = pos->second;
     return true;
   }
   return false;
 }
 
 void SetExemplarSetForLang(const std::string& lang,
                            icu::UnicodeSet* lang_set) {
-  LangToExemplarSetMap& map = Singleton<LangToExemplarSet>()->map;
+  LangToExemplarSetMap& map = LangToExemplarSet::GetInstance()->map;
   map.insert(std::make_pair(lang, lang_set));
 }
 
 static Lock lang_set_lock;
 
 // Returns true if all the characters in component_characters are used by
 // the language |lang|.
 bool IsComponentCoveredByLang(const icu::UnicodeSet& component_characters,
                               const std::string& lang) {
   static const icu::UnicodeSet kASCIILetters(0x61, 0x7a);  // [a-z]
@@ skipping 1493 matching lines @@
 }
 
 int GetPortFromAddrinfo(const struct addrinfo* info) {
   uint16* port_field = GetPortFieldFromAddrinfo(info);
   if (!port_field)
     return -1;
   return ntohs(*port_field);
 }
 
 }  // namespace net