ozone: caca: Fix the build

ui/ozone/platform/caca/caca_surface_factory.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/platform/caca/caca_surface_factory.h"
 
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "ui/gfx/ozone/surface_ozone_canvas.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/vsync_provider.h"
 #include "ui/ozone/platform/caca/caca_connection.h"
 
 namespace ui {
 
 namespace {
 
 const gfx::AcceleratedWidget kDefaultWidgetHandle = 1;
 
 class CacaSurface : public gfx::SurfaceOzoneCanvas {
  public:
   CacaSurface(CacaConnection* connection);
   virtual ~CacaSurface();
 
+  bool Initialize();
+
   // gfx::SurfaceOzoneCanvas overrides:
   virtual skia::RefPtr<SkCanvas> GetCanvas() OVERRIDE;
   virtual bool ResizeCanvas(const gfx::Size& viewport_size) OVERRIDE;
   virtual bool PresentCanvas() OVERRIDE;
   virtual scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() OVERRIDE;
 
  private:
   CacaConnection* connection_;  // Not owned.
 
   caca_dither_t* dither_;
 
   skia::RefPtr<SkSurface> surface_;
 
   DISALLOW_COPY_AND_ASSIGN(CacaSurface);
 };
 
 CacaSurface::CacaSurface(CacaConnection* connection)
   : connection_(connection) {}
 
 CacaSurface::~CacaSurface() {
   caca_free_dither(dither_);
 }
 
-bool CacaSurface::InitializeCanvas() {
+bool CacaSurface::Initialize() {
   SkImageInfo info = SkImageInfo::Make(connection_->bitmap_size().width(),
                                        connection_->bitmap_size().height(),
                                        kPMColor_SkColorType,
                                        kPremul_SkAlphaType);
 
   surface_ = skia::AdoptRef(SkSurface::NewRaster(info));
   if (!surface_) {
     LOG(ERROR) << "Failed to create SkCanvas";
     return false;
   }
@@ skipping 73 matching lines @@
       SetGLGetProcAddressProcCallback set_gl_get_proc_address) {
   NOTREACHED();
   return false;
 }
 
 scoped_ptr<gfx::SurfaceOzoneCanvas> CacaSurfaceFactory::CreateCanvasForWidget(
     gfx::AcceleratedWidget widget) {
   CHECK_EQ(INITIALIZED, state_);
   CHECK_EQ(kDefaultWidgetHandle, widget);
 
-  return make_scoped_ptr<gfx::SurfaceOzoneCanvas>(new CacaSurface(connection_));
+  scoped_ptr<CacaSurface> canvas(new CacaSurface(connection_));
+  CHECK(canvas->Initialize());
+  return canvas.PassAs<gfx::SurfaceOzoneCanvas>();
 }
 
 }  // namespace ui