Move Singleton and related structs to namespace base

content/browser/android/browser_surface_texture_manager.cc

 // Copyright 2014 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/browser_surface_texture_manager.h"
 
 #include <android/native_window_jni.h>
 
 #include "base/android/jni_android.h"
 #include "content/browser/android/child_process_launcher_android.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
 #include "content/browser/media/android/browser_media_player_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/gl/android/scoped_java_surface.h"
 #include "ui/gl/android/surface_texture.h"
 
 namespace content {
 
 // static
 BrowserSurfaceTextureManager* BrowserSurfaceTextureManager::GetInstance() {
-  return Singleton<BrowserSurfaceTextureManager,
-                   LeakySingletonTraits<BrowserSurfaceTextureManager>>::get();
+  return base::Singleton<
+      BrowserSurfaceTextureManager,
+      base::LeakySingletonTraits<BrowserSurfaceTextureManager>>::get();
 }
 
 void BrowserSurfaceTextureManager::RegisterSurfaceTexture(
     int surface_texture_id,
     int client_id,
     gfx::SurfaceTexture* surface_texture) {
   content::CreateSurfaceTextureSurface(
       surface_texture_id, client_id, surface_texture);
 }
 
@@ skipping 40 matching lines @@
 
 BrowserSurfaceTextureManager::BrowserSurfaceTextureManager() {
   SurfaceTexturePeer::InitInstance(this);
 }
 
 BrowserSurfaceTextureManager::~BrowserSurfaceTextureManager() {
   SurfaceTexturePeer::InitInstance(nullptr);
 }
 
 }  // namespace content