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

ui/ozone/demo/software_renderer.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 "ui/ozone/demo/software_renderer.h"
 
 #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"
 
 namespace ui {
 namespace {
 
 const int kFrameDelayMilliseconds = 16;
 
 }  // namespace
 
 SoftwareRenderer::SoftwareRenderer(gfx::AcceleratedWidget widget,
                                    const gfx::Size& size)
     : RendererBase(widget, size),
       vsync_period_(base::TimeDelta::FromMilliseconds(kFrameDelayMilliseconds)),
       weak_ptr_factory_(this) {
 }
 
 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;
   }
 
   software_surface_->ResizeCanvas(size_);
   vsync_provider_ = software_surface_->CreateVSyncProvider();
   RenderFrame();
   return true;
 }
@@ skipping 18 matching lines @@
 
   timer_.Start(FROM_HERE, vsync_period_, this, &SoftwareRenderer::RenderFrame);
 }
 
 void SoftwareRenderer::UpdateVSyncParameters(const base::TimeTicks timebase,
                                              const base::TimeDelta interval) {
   vsync_period_ = interval;
 }
 
 }  // namespace ui