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

chrome/browser/chromeos/wm_ipc.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_WM_IPC_H_
 #define CHROME_BROWSER_CHROMEOS_WM_IPC_H_
 #pragma once
 
 #include <gtk/gtk.h>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
-#include "base/singleton.h"
 #include "cros/chromeos_wm_ipc_enums.h"
 
 typedef unsigned long Atom;
 typedef unsigned long XID;
 
+namespace base {
+template <typename T> struct DefaultLazyInstanceTraits;
+}
+
 namespace chromeos {
 
 class WmIpc {
  public:
   enum AtomType {
     ATOM_CHROME_LOGGED_IN = 0,
     ATOM_CHROME_WINDOW_TYPE,
     ATOM_CHROME_WM_MESSAGE,
     ATOM_MANAGER,
     ATOM_STRING,
@@ skipping 75 matching lines @@
   // Specifically, this catches messages about the WM_S0 selection that get sent
   // when a window manager process starts (so that we can re-run InitWmInfo()).
   // See ICCCM 2.8 for more info about MANAGER selections.
   void HandleNonChromeClientMessageEvent(const GdkEventClient& event);
 
   // Sets a _CHROME_LOGGED_IN property on the root window describing whether
   // the user is currently logged in or not.
   void SetLoggedInProperty(bool logged_in);
 
  private:
-  friend struct DefaultSingletonTraits<WmIpc>;
+  friend struct base::DefaultLazyInstanceTraits<WmIpc>;
 
   WmIpc();
 
   // Initialize 'wm_' and send the window manager a message telling it the
   // version of the IPC protocol that we support.  This is called in our
   // constructor, but needs to be re-run if the window manager gets restarted.
   void InitWmInfo();
 
   // Maps from our Atom enum to the X server's atom IDs and from the
   // server's IDs to atoms' string names.  These maps aren't necessarily in
   // sync; 'atom_to_xatom_' is constant after the constructor finishes but
   // GetName() caches additional string mappings in 'xatom_to_string_'.
   std::map<AtomType, Atom> type_to_atom_;
   std::map<Atom, std::string> atom_to_string_;
 
   // Cached value of type_to_atom_[ATOM_CHROME_WM_MESSAGE].
   Atom wm_message_atom_;
 
   // Handle to the wm. Used for sending messages.
   XID wm_;
 
   DISALLOW_COPY_AND_ASSIGN(WmIpc);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_WM_IPC_H_