Move Singleton and related structs to namespace base

content/browser/android/in_process_surface_texture_manager.h

 // 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.
 
 #ifndef CONTENT_BROWSER_ANDROID_IN_PROCESS_SURFACE_TEXTURE_MANAGER_H_
 #define CONTENT_BROWSER_ANDROID_IN_PROCESS_SURFACE_TEXTURE_MANAGER_H_
 
 #include "content/common/android/surface_texture_manager.h"
 
 #include "base/containers/scoped_ptr_hash_map.h"
@@ skipping 21 matching lines @@
       int surface_texture_id) override;
 
   // Overridden from SurfaceTexturePeer:
   void EstablishSurfaceTexturePeer(
       base::ProcessHandle render_process_handle,
       scoped_refptr<gfx::SurfaceTexture> surface_texture,
       int render_frame_id,
       int player_id) override;
 
  private:
-  friend struct DefaultSingletonTraits<InProcessSurfaceTextureManager>;
+  friend struct base::DefaultSingletonTraits<InProcessSurfaceTextureManager>;
 
   InProcessSurfaceTextureManager();
   ~InProcessSurfaceTextureManager() override;
 
   using SurfaceTextureMap =
       base::ScopedPtrHashMap<int, scoped_ptr<gfx::ScopedJavaSurface>>;
   SurfaceTextureMap surface_textures_;
   base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(InProcessSurfaceTextureManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ANDROID_IN_PROCESS_SURFACE_TEXTURE_MANAGER_H_