Index: chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc |
diff --git a/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc b/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc |
index 003fad2a80cab6ce5f59d42557d0d1ea739b2575..d88c947c00b5cdb6b5cc1373195703c1a1a92585 100644 |
--- a/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc |
+++ b/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc |
@@ -1,4 +1,4 @@ |
-// 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. |
@@ -121,8 +121,7 @@ static const char* kTimeZones[] = { |
"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 { |