| Index: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc | 
| diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc | 
| index 54d67ad2369799a17ee7e9c1862f7d59a8c92f5d..2809f02007c756fb69130be258751e872d18d392 100644 | 
| --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc | 
| +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc | 
| @@ -288,8 +288,7 @@ void DesktopWindowTreeHostX11::OnNativeWidgetCreated( | 
| } | 
|  | 
| scoped_ptr<corewm::Tooltip> DesktopWindowTreeHostX11::CreateTooltip() { | 
| -  return scoped_ptr<corewm::Tooltip>( | 
| -      new corewm::TooltipAura(gfx::SCREEN_TYPE_NATIVE)); | 
| +  return make_scoped_ptr(new corewm::TooltipAura(gfx::SCREEN_TYPE_NATIVE)); | 
| } | 
|  | 
| scoped_ptr<aura::client::DragDropClient> | 
| @@ -298,7 +297,7 @@ DesktopWindowTreeHostX11::CreateDragDropClient( | 
| drag_drop_client_ = new DesktopDragDropClientAuraX11( | 
| window(), cursor_manager, xdisplay_, xwindow_); | 
| drag_drop_client_->Init(); | 
| -  return scoped_ptr<aura::client::DragDropClient>(drag_drop_client_).Pass(); | 
| +  return make_scoped_ptr(drag_drop_client_); | 
| } | 
|  | 
| void DesktopWindowTreeHostX11::Close() { | 
|  |