Move Singleton and related structs to namespace base

content/browser/android/browser_surface_texture_manager.h

 // 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.
 
 #ifndef CONTENT_BROWSER_ANDROID_BROWSER_SURFACE_TEXTURE_MANAGER_H_
 #define CONTENT_BROWSER_ANDROID_BROWSER_SURFACE_TEXTURE_MANAGER_H_
 
 #include "content/common/android/surface_texture_manager.h"
 
 #include "base/memory/singleton.h"
@@ skipping 17 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<BrowserSurfaceTextureManager>;
+  friend struct base::DefaultSingletonTraits<BrowserSurfaceTextureManager>;
 
   BrowserSurfaceTextureManager();
   ~BrowserSurfaceTextureManager() override;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserSurfaceTextureManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ANDROID_BROWSER_SURFACE_TEXTURE_MANAGER_H_