Index: ui/ozone/platform/caca/ozone_platform_caca.cc |
diff --git a/ui/ozone/platform/caca/ozone_platform_caca.cc b/ui/ozone/platform/caca/ozone_platform_caca.cc |
index a34f0141268139e7fcc723876a141a5c63474e8c..c3b3233bfdf14170b066a24182f1332ffcb08f9d 100644 |
--- a/ui/ozone/platform/caca/ozone_platform_caca.cc |
+++ b/ui/ozone/platform/caca/ozone_platform_caca.cc |
@@ -39,8 +39,8 @@ class OzonePlatformCaca : public OzonePlatform { |
scoped_ptr<CacaWindow> caca_window(new CacaWindow( |
delegate, window_manager_.get(), event_source_.get(), bounds)); |
if (!caca_window->Initialize()) |
- return scoped_ptr<PlatformWindow>(); |
- return caca_window.PassAs<PlatformWindow>(); |
+ return nullptr; |
+ return caca_window.Pass(); |
} |
virtual scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() |
override { |