Move Singleton and related structs to namespace base

content/browser/browser_io_surface_manager_mac.cc

 // Copyright 2015 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 "content/browser/browser_io_surface_manager_mac.h"
 
 #include <servers/bootstrap.h>
 
 #include <string>
 
@@ skipping 13 matching lines @@
                             pid);
 }
 
 // Amount of time to wait before giving up when sending a reply message.
 const int kSendReplyTimeoutMs = 100;
 
 }  // namespace
 
 // static
 BrowserIOSurfaceManager* BrowserIOSurfaceManager::GetInstance() {
-  return Singleton<BrowserIOSurfaceManager,
-                   LeakySingletonTraits<BrowserIOSurfaceManager>>::get();
+  return base::Singleton<
+      BrowserIOSurfaceManager,
+      base::LeakySingletonTraits<BrowserIOSurfaceManager>>::get();
 }
 
 // static
 base::mac::ScopedMachSendRight BrowserIOSurfaceManager::LookupServicePort(
     pid_t pid) {
   // Look up the named IOSurfaceManager port that's been registered with
   // the bootstrap server.
   mach_port_t port;
   kern_return_t kr =
       bootstrap_look_up(bootstrap_port, GetMachPortName(pid).c_str(), &port);
@@ skipping 255 matching lines @@
   }
 
   reply->body.msgh_descriptor_count = 1;
   reply->io_surface_port.name = it->second->get();
   reply->io_surface_port.disposition = MACH_MSG_TYPE_COPY_SEND;
   reply->io_surface_port.type = MACH_MSG_PORT_DESCRIPTOR;
   return true;
 }
 
 }  // namespace content