Index: net/base/net_util.cc |
diff --git a/net/base/net_util.cc b/net/base/net_util.cc |
index 9417c1a054574fc0d1af62a2c16bbaf3d8c08790..05115c90b1577ee3d0b82c9643a06a79dfe9f201 100644 |
--- a/net/base/net_util.cc |
+++ b/net/base/net_util.cc |
@@ -484,8 +484,7 @@ void SetExemplarSetForLang(const std::string& lang, |
map.insert(std::make_pair(lang, lang_set)); |
} |
-static base::LazyInstance<base::Lock, |
- base::LeakyLazyInstanceTraits<base::Lock> > |
+static base::LazyInstance<base::Lock>::Leaky |
g_lang_set_lock = LAZY_INSTANCE_INITIALIZER; |
// Returns true if all the characters in component_characters are used by |
@@ -1110,8 +1109,7 @@ const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 1 << 2; |
const FormatUrlType kFormatUrlOmitAll = kFormatUrlOmitUsernamePassword | |
kFormatUrlOmitHTTP | kFormatUrlOmitTrailingSlashOnBareHostname; |
-static base::LazyInstance<std::multiset<int>, |
- base::LeakyLazyInstanceTraits<std::multiset<int> > > |
+static base::LazyInstance<std::multiset<int> >::Leaky |
g_explicitly_allowed_ports = LAZY_INSTANCE_INITIALIZER; |
size_t GetCountOfExplicitlyAllowedPorts() { |