Revert of ozone: Remove singleton pattern for SurfaceFactoryOzone.

content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc

Index: content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc
diff --git a/content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc b/content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc
index dfc0e38ee0b4b1c8518c922f1289fd658c00fc6a..fa12bf90c4f1661bfa32e688b7b63de0b4074c51 100644
--- a/content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc
+++ b/content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc
@@ -6,7 +6,6 @@
 
 #include "base/logging.h"
 #include "ui/gl/gl_image.h"
-#include "ui/ozone/public/ozone_platform.h"
 #include "ui/ozone/public/surface_factory_ozone.h"
 
 namespace content {
@@ -42,9 +41,8 @@
 void GpuMemoryBufferFactoryOzoneNativeBuffer::
     GetSupportedGpuMemoryBufferConfigurations(
         std::vector<Configuration>* configurations) {
-  if (!ui::OzonePlatform::GetInstance()
-           ->GetSurfaceFactoryOzone()
-           ->CanCreateNativePixmap(ui::SurfaceFactoryOzone::SCANOUT))
+  if (!ui::SurfaceFactoryOzone::GetInstance()->CanCreateNativePixmap(
+          ui::SurfaceFactoryOzone::SCANOUT))
     return;
 
   configurations->assign(