Reland of Revert of ozone: Remove singleton pattern for SurfaceFactoryOzone.

ui/ozone/demo/software_renderer.cc

Index: ui/ozone/demo/software_renderer.cc
diff --git a/ui/ozone/demo/software_renderer.cc b/ui/ozone/demo/software_renderer.cc
index 45cbd7c6657e206d8884b1170b415710383c2b41..162d5e0e4b43c5e101d332085bbcdd40c1592dfa 100644
--- a/ui/ozone/demo/software_renderer.cc
+++ b/ui/ozone/demo/software_renderer.cc
@@ -7,6 +7,7 @@
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "ui/gfx/vsync_provider.h"
+#include "ui/ozone/public/ozone_platform.h"

[dshwang, 2015/06/05 08:12:02]

this line is added.

 #include "ui/ozone/public/surface_factory_ozone.h"
 #include "ui/ozone/public/surface_ozone_canvas.h"
 
@@ -28,8 +29,9 @@ SoftwareRenderer::~SoftwareRenderer() {
 }
 
 bool SoftwareRenderer::Initialize() {
-  software_surface_ =
-      ui::SurfaceFactoryOzone::GetInstance()->CreateCanvasForWidget(widget_);
+  software_surface_ = ui::OzonePlatform::GetInstance()
+                          ->GetSurfaceFactoryOzone()
+                          ->CreateCanvasForWidget(widget_);
   if (!software_surface_) {
     LOG(ERROR) << "Failed to create software surface";
     return false;