Move Singleton and related structs to namespace base

content/child/child_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/child/child_io_surface_manager_mac.h"
 
 #include "base/mac/mach_logging.h"
 #include "content/common/mac/io_surface_manager_messages.h"
 
 namespace content {
 
 // static
 ChildIOSurfaceManager* ChildIOSurfaceManager::GetInstance() {
-  return Singleton<ChildIOSurfaceManager,
-                   LeakySingletonTraits<ChildIOSurfaceManager>>::get();
+  return base::Singleton<
+      ChildIOSurfaceManager,
+      base::LeakySingletonTraits<ChildIOSurfaceManager>>::get();
 }
 
 bool ChildIOSurfaceManager::RegisterIOSurface(IOSurfaceId io_surface_id,
                                               int client_id,
                                               IOSurfaceRef io_surface) {
   DCHECK(service_port_.is_valid());
   DCHECK(!token_.IsZero());
 
   mach_port_t reply_port;
   kern_return_t kr = mach_port_allocate(mach_task_self(),
@@ skipping 116 matching lines @@
   return IOSurfaceLookupFromMachPort(scoped_io_surface_right);
 }
 
 ChildIOSurfaceManager::ChildIOSurfaceManager()
     : set_token_event_(true, false) {}
 
 ChildIOSurfaceManager::~ChildIOSurfaceManager() {
 }
 
 }  // namespace content