ozone: gracefully handle SoftwareOutputDeviceOzoneTest.CheckCorrectResizeBehavior

content/browser/compositor/software_output_device_ozone.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 "content/browser/compositor/software_output_device_ozone.h"
 #include "ui/compositor/compositor.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/vsync_provider.h"
 #include "ui/ozone/public/ozone_platform.h"
 #include "ui/ozone/public/surface_factory_ozone.h"
 #include "ui/ozone/public/surface_ozone_canvas.h"
 
 namespace content {
 
+// static
+scoped_ptr<SoftwareOutputDeviceOzone> SoftwareOutputDeviceOzone::Create(
+    ui::Compositor* compositor) {
+  scoped_ptr<SoftwareOutputDeviceOzone> result(
+      new SoftwareOutputDeviceOzone(compositor));
+  if (!result->surface_ozone_)
+    return nullptr;
+  return result;
+}
+
 SoftwareOutputDeviceOzone::SoftwareOutputDeviceOzone(ui::Compositor* compositor)
     : compositor_(compositor) {
   ui::SurfaceFactoryOzone* factory =
       ui::OzonePlatform::GetInstance()->GetSurfaceFactoryOzone();
 
   surface_ozone_ = factory->CreateCanvasForWidget(compositor_->widget());
 
-  if (!surface_ozone_)
-    LOG(FATAL) << "Failed to initialize canvas";
+  if (!surface_ozone_) {
+    LOG(ERROR) << "Failed to initialize canvas";
+    return;
+  }
 
   vsync_provider_ = surface_ozone_->CreateVSyncProvider();
 }
 
 SoftwareOutputDeviceOzone::~SoftwareOutputDeviceOzone() {
 }
 
 void SoftwareOutputDeviceOzone::Resize(const gfx::Size& viewport_pixel_size,
                                        float scale_factor) {
   scale_factor_ = scale_factor;
@@ skipping 15 matching lines @@
   return SoftwareOutputDevice::BeginPaint(damage_rect);
 }
 
 void SoftwareOutputDeviceOzone::EndPaint() {
   SoftwareOutputDevice::EndPaint();
 
   surface_ozone_->PresentCanvas(damage_rect_);
 }
 
 }  // namespace content