Continuation of CL 5685007, rename the singleton accessor method in more files.

chrome/browser/chromeos/cros_settings.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 "chrome/browser/chromeos/cros_settings.h"
 
-#include "base/singleton.h"
+#include "base/lazy_instance.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros_settings_provider.h"
 #include "chrome/browser/chromeos/user_cros_settings_provider.h"
 #include "chrome/common/notification_service.h"
 
 namespace chromeos {
 
+static base::LazyInstance<CrosSettings> g_cros_settings(
+    base::LINKER_INITIALIZED);
+
 CrosSettings* CrosSettings::Get() {
   // TODO(xiyaun): Use real stuff when underlying libcros is ready.
-  return Singleton<CrosSettings>::get();
+  return g_cros_settings.Pointer();
 }
 
 bool CrosSettings::IsCrosSettings(const std::string& path) {
   return StartsWithASCII(path, kCrosSettingsPrefix, true);
 }
 
 void CrosSettings::FireObservers(const char* path) {
   DCHECK(CalledOnValidThread());
   std::string path_str(path);
   SettingsObserverMap::iterator observer_iterator =
@@ skipping 168 matching lines @@
 }
 
 CrosSettings::CrosSettings() {
 }
 
 CrosSettings::~CrosSettings() {
   DCHECK(providers_.empty());
 }
 
 }  // namespace chromeos