Move Singleton and related structs to namespace base

content/browser/gpu/gpu_surface_tracker.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 "content/browser/gpu/gpu_surface_tracker.h"
 
 #if defined(OS_ANDROID)
 #include <android/native_window_jni.h>
 #endif  // defined(OS_ANDROID)
 
 #include "base/logging.h"
 
 namespace content {
 
 GpuSurfaceTracker::GpuSurfaceTracker()
     : next_surface_id_(1) {
   GpuSurfaceLookup::InitInstance(this);
 }
 
 GpuSurfaceTracker::~GpuSurfaceTracker() {
   GpuSurfaceLookup::InitInstance(NULL);
 }
 
 GpuSurfaceTracker* GpuSurfaceTracker::GetInstance() {
-  return Singleton<GpuSurfaceTracker>::get();
+  return base::Singleton<GpuSurfaceTracker>::get();
 }
 
 int GpuSurfaceTracker::AddSurfaceForRenderer(int renderer_id,
                                              int render_widget_id) {
   base::AutoLock lock(lock_);
   int surface_id = next_surface_id_++;
   surface_map_[surface_id] =
       SurfaceInfo(renderer_id, render_widget_id, gfx::kNullAcceleratedWidget,
                   gfx::GLSurfaceHandle(), NULL);
   return surface_id;
@@ skipping 103 matching lines @@
     : renderer_id(renderer_id),
       render_widget_id(render_widget_id),
       native_widget(native_widget),
       handle(handle),
       surface_ref(surface_ref) { }
 
 GpuSurfaceTracker::SurfaceInfo::~SurfaceInfo() { }
 
 
 }  // namespace content