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

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"
@@ skipping 55 matching lines @@
   }
 
   if (player != player_manager->GetFullscreenPlayer()) {
     gfx::ScopedJavaSurface scoped_surface(surface_texture.get());
     player->SetVideoSurface(scoped_surface.Pass());
   }
 }
 
 }  // namespace
 
-BrowserSurfaceTextureManager::BrowserSurfaceTextureManager() {
-  SurfaceTexturePeer::InitInstance(this);
-}
-
-BrowserSurfaceTextureManager::~BrowserSurfaceTextureManager() {
-  SurfaceTexturePeer::InitInstance(NULL);
+// static
+BrowserSurfaceTextureManager* BrowserSurfaceTextureManager::GetInstance() {
+  return Singleton<BrowserSurfaceTextureManager,
+                   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 34 matching lines @@
 
   BrowserThread::PostTask(BrowserThread::UI,
                           FROM_HERE,
                           base::Bind(&SetSurfacePeer,
                                      surface_texture,
                                      render_process_handle,
                                      render_frame_id,
                                      player_id));
 }
 
+BrowserSurfaceTextureManager::BrowserSurfaceTextureManager() {
+  SurfaceTexturePeer::InitInstance(this);
+}
+
+BrowserSurfaceTextureManager::~BrowserSurfaceTextureManager() {
+  SurfaceTexturePeer::InitInstance(nullptr);
+}
+
 }  // namespace content