Move Singleton and related structs to namespace base

content/browser/android/in_process_surface_texture_manager.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/android/in_process_surface_texture_manager.h"
 
 #include <android/native_window.h>
 #include <android/native_window_jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/logging.h"
 #include "content/browser/media/android/browser_media_player_manager.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace content {
 
 // static
 InProcessSurfaceTextureManager* InProcessSurfaceTextureManager::GetInstance() {
-  return Singleton<InProcessSurfaceTextureManager,
-                   LeakySingletonTraits<InProcessSurfaceTextureManager>>::get();
+  return base::Singleton<
+      InProcessSurfaceTextureManager,
+      base::LeakySingletonTraits<InProcessSurfaceTextureManager>>::get();
 }
 
 void InProcessSurfaceTextureManager::RegisterSurfaceTexture(
     int surface_texture_id,
     int client_id,
     gfx::SurfaceTexture* surface_texture) {
   base::AutoLock lock(lock_);
 
   DCHECK(surface_textures_.find(surface_texture_id) == surface_textures_.end());
   surface_textures_.add(
@@ skipping 37 matching lines @@
 
 InProcessSurfaceTextureManager::InProcessSurfaceTextureManager() {
   SurfaceTexturePeer::InitInstance(this);
 }
 
 InProcessSurfaceTextureManager::~InProcessSurfaceTextureManager() {
   SurfaceTexturePeer::InitInstance(nullptr);
 }
 
 }  // namespace content