Move Singleton and related structs to namespace base

ipc/ipc_channel_posix.cc

 // 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.
 
 #include "ipc/ipc_channel_posix.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <stddef.h>
 #include <sys/socket.h>
@@ skipping 76 matching lines @@
 //   connects. Once the client connects, the server will close the original
 //   copy of the client socket and remove the mapping. Thus, when the client
 //   object closes, it will close the only remaining copy of the client socket
 //   in the fd table and the server will see EOF on its side.
 //
 // TODO(port): a client process cannot connect to multiple IPC channels with
 // this scheme.
 
 class PipeMap {
  public:
-  static PipeMap* GetInstance() {
-    return Singleton<PipeMap>::get();
-  }
+  static PipeMap* GetInstance() { return base::Singleton<PipeMap>::get(); }
 
   ~PipeMap() {
     // Shouldn't have left over pipes.
     DCHECK(map_.empty());
   }
 
   // Lookup a given channel id. Return -1 if not found.
   int Lookup(const std::string& channel_id) {
     base::AutoLock locked(lock_);
 
@@ skipping 21 matching lines @@
                            << "for '" << channel_id << "' while first "
                            << "(fd " << i->second << ") still exists";
     map_[channel_id] = fd;
   }
 
  private:
   base::Lock lock_;
   typedef std::map<std::string, int> ChannelToFDMap;
   ChannelToFDMap map_;
 
-  friend struct DefaultSingletonTraits<PipeMap>;
+  friend struct base::DefaultSingletonTraits<PipeMap>;
 #if defined(OS_ANDROID)
   friend void ::IPC::Channel::NotifyProcessForkedForTesting();
 #endif
 };
 
 //------------------------------------------------------------------------------
 
 bool SocketWriteErrorIsRecoverable() {
 #if defined(OS_MACOSX)
   // On OS X if sendmsg() is trying to send fds between processes and there
@@ skipping 893 matching lines @@
 }
 
 #if defined(OS_LINUX)
 // static
 void Channel::SetGlobalPid(int pid) {
   ChannelPosix::SetGlobalPid(pid);
 }
 #endif  // OS_LINUX
 
 }  // namespace IPC