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

chrome/browser/chromeos/cros_settings.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_CROS_SETTINGS_H_
 #define CHROME_BROWSER_CHROMEOS_CROS_SETTINGS_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/hash_tables.h"
 #include "base/non_thread_safe.h"
 #include "base/observer_list.h"
 #include "base/singleton.h"
 #include "chrome/browser/chromeos/cros_settings_names.h"
 #include "chrome/common/notification_observer.h"
 
+namespace base {
+template <typename T> struct DefaultLazyInstanceTraits;
+}
+
 class Value;
 
 namespace chromeos {
 
 class CrosSettingsProvider;
 
 // A class manages per-device/global settings.
 class CrosSettings : public NonThreadSafe {
  public:
   // Class factory.
@@ skipping 44 matching lines @@
   // A map from settings names to a list of observers. Observers get fired in
   // the order they are added.
   typedef ObserverList<NotificationObserver> NotificationObserverList;
   typedef base::hash_map<std::string, NotificationObserverList*>
       SettingsObserverMap;
   SettingsObserverMap settings_observers_;
 
   CrosSettings();
   ~CrosSettings();
   CrosSettingsProvider* GetProvider(const std::string& path) const;
-  friend struct DefaultSingletonTraits<CrosSettings>;
+  friend struct base::DefaultLazyInstanceTraits<CrosSettings>;
 
   DISALLOW_COPY_AND_ASSIGN(CrosSettings);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CROS_SETTINGS_H_