| Index: chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.cc
|
| diff --git a/chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.cc b/chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.cc
|
| index 51ffde6d7381d555f9a8dfcf818c92c43ed5f18f..3479ec87c1bf61d697b80de86f967667d489cc00 100644
|
| --- a/chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.cc
|
| +++ b/chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.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 {
|
|
|