Re-land: content: Single process support for native GpuMemoryBuffers.

content/browser/android/browser_surface_texture_manager.cc

Index: content/browser/android/browser_surface_texture_manager.cc
diff --git a/content/browser/android/browser_surface_texture_manager.cc b/content/browser/android/browser_surface_texture_manager.cc
index 832036b1864ef4af1bbc42aaef48ae9ab8536a9b..93c10f13ff2e70ad97fca1eb9ae4b41f8babbe08 100644
--- a/content/browser/android/browser_surface_texture_manager.cc
+++ b/content/browser/android/browser_surface_texture_manager.cc
@@ -73,12 +73,10 @@ static void SetSurfacePeer(scoped_refptr<gfx::SurfaceTexture> surface_texture,
 
 }  // namespace
 
-BrowserSurfaceTextureManager::BrowserSurfaceTextureManager() {
-  SurfaceTexturePeer::InitInstance(this);
-}
-
-BrowserSurfaceTextureManager::~BrowserSurfaceTextureManager() {
-  SurfaceTexturePeer::InitInstance(NULL);
+// static
+BrowserSurfaceTextureManager* BrowserSurfaceTextureManager::GetInstance() {
+  return Singleton<BrowserSurfaceTextureManager,
+                   LeakySingletonTraits<BrowserSurfaceTextureManager>>::get();
 }
 
 void BrowserSurfaceTextureManager::RegisterSurfaceTexture(
@@ -133,4 +131,12 @@ void BrowserSurfaceTextureManager::EstablishSurfaceTexturePeer(
                                      player_id));
 }
 
+BrowserSurfaceTextureManager::BrowserSurfaceTextureManager() {
+  SurfaceTexturePeer::InitInstance(this);
+}
+
+BrowserSurfaceTextureManager::~BrowserSurfaceTextureManager() {
+  SurfaceTexturePeer::InitInstance(nullptr);
+}
+
 }  // namespace content