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

content/browser/android/browser_surface_texture_manager.h

Index: content/browser/android/browser_surface_texture_manager.h
diff --git a/content/browser/android/browser_surface_texture_manager.h b/content/browser/android/browser_surface_texture_manager.h
index 959d270548874b736c745db4a735cf4b5957967c..71765024975de30d485a1dedd735271f4abad084 100644
--- a/content/browser/android/browser_surface_texture_manager.h
+++ b/content/browser/android/browser_surface_texture_manager.h
@@ -7,6 +7,7 @@
 
 #include "content/common/android/surface_texture_manager.h"
 
+#include "base/memory/singleton.h"
 #include "content/common/android/surface_texture_peer.h"
 
 namespace content {
@@ -14,8 +15,8 @@ namespace content {
 class BrowserSurfaceTextureManager : public SurfaceTextureManager,
                                      public SurfaceTexturePeer {
  public:
-  BrowserSurfaceTextureManager();
-  ~BrowserSurfaceTextureManager() override;
+  // Returns the global BrowserSurfaceTextureManager.
+  static BrowserSurfaceTextureManager* GetInstance();
 
   // Overridden from SurfaceTextureManager:
   void RegisterSurfaceTexture(int surface_texture_id,
@@ -33,6 +34,11 @@ class BrowserSurfaceTextureManager : public SurfaceTextureManager,
       int player_id) override;
 
  private:
+  friend struct DefaultSingletonTraits<BrowserSurfaceTextureManager>;
+
+  BrowserSurfaceTextureManager();
+  ~BrowserSurfaceTextureManager() override;
+
   DISALLOW_COPY_AND_ASSIGN(BrowserSurfaceTextureManager);
 };