aura: A couple of API cleanups.

ui/views/widget/desktop_aura/desktop_native_widget_aura.h

Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.h
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
index 85a0a3a28ecbfd89429e33c71b310145a66b9227..8735ac0773dac909c48476c97f4a69cf19c6effa 100644
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
@@ -83,7 +83,7 @@ class VIEWS_EXPORT DesktopNativeWidgetAura
     return input_method_event_filter_.get();
   }
   wm::CompoundEventFilter* root_window_event_filter() {
-    return root_window_event_filter_;
+    return root_window_event_filter_.get();
   }
   aura::WindowTreeHost* host() {
     return host_.get();
@@ -280,7 +280,7 @@ class VIEWS_EXPORT DesktopNativeWidgetAura
   scoped_ptr<FocusManagerEventHandler> focus_manager_event_handler_;
 
   // Toplevel event filter which dispatches to other event filters.
-  wm::CompoundEventFilter* root_window_event_filter_;
+  scoped_ptr<wm::CompoundEventFilter> root_window_event_filter_;
 
   scoped_ptr<wm::InputMethodEventFilter> input_method_event_filter_;