Convert all remaining explicit LeakyLazyInstanceTraits users to ::Leaky

chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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 "chrome/browser/ui/webui/options/chromeos/system_settings_provider.h"
 
 #include <string>
 
 #include "base/i18n/rtl.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 102 matching lines @@
     "Australia/Hobart",
     "Australia/Sydney",
     "Asia/Vladivostok",
     "Pacific/Guam",
     "Asia/Magadan",
     "Pacific/Auckland",
     "Pacific/Fiji",
     "Pacific/Tongatapu",
 };
 
-static base::LazyInstance<base::Lock,
-                          base::LeakyLazyInstanceTraits<base::Lock> >
+static base::LazyInstance<base::Lock>::Leaky
     g_timezone_bundle_lock = LAZY_INSTANCE_INITIALIZER;
 
 struct UResClose {
   inline void operator() (UResourceBundle* b) const {
     ures_close(b);
   }
 };
 
 string16 GetExemplarCity(const icu::TimeZone& zone) {
   // TODO(jungshik): After upgrading to ICU 4.6, use U_ICUDATA_ZONE
@@ skipping 188 matching lines @@
     const icu::TimeZone* known_timezone = *iter;
     if (known_timezone->hasSameRules(timezone))
       return GetTimezoneID(*known_timezone);
   }
 
   // Not able to find a matching timezone in our list.
   return string16();
 }
 
 }  // namespace chromeos