aura: Fix unit_tests on linux

ui/aura/desktop_host_linux.cc

 // Copyright (c) 2011 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/aura/desktop_host.h"
 
 #include <X11/cursorfont.h>
 #include <X11/Xlib.h>
 
 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.
 #undef RootWindow
 
 #include <algorithm>
 
 #include "base/message_loop.h"
+#include "base/message_pump_observer.h"
 #include "base/message_pump_x.h"
 #include "ui/aura/cursor.h"
 #include "ui/aura/desktop.h"
 #include "ui/aura/event.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/touch/touch_factory.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/compositor/layer.h"
 
 #include <X11/cursorfont.h>
@@ skipping 189 matching lines @@
     case ui::VKEY_OEM_PLUS:
     case ui::VKEY_OEM_COMMA:
     case ui::VKEY_OEM_MINUS:
     case ui::VKEY_OEM_PERIOD:
       return true;
     default:
       return false;
   }
 }
 
-class DesktopHostLinux : public DesktopHost {
+class DesktopHostLinux : public DesktopHost,
+                         public base::MessagePumpObserver {
  public:
   explicit DesktopHostLinux(const gfx::Rect& bounds);
   virtual ~DesktopHostLinux();
 
  private:
   // base::MessageLoop::Dispatcher Override.
   virtual DispatchStatus Dispatch(XEvent* xev) OVERRIDE;
 
   // DesktopHost Overrides.
   virtual void SetDesktop(Desktop* desktop) OVERRIDE;
   virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
   virtual void Show() OVERRIDE;
   virtual void ToggleFullScreen() OVERRIDE;
   virtual gfx::Size GetSize() const OVERRIDE;
   virtual void SetSize(const gfx::Size& size) OVERRIDE;
   virtual gfx::Point GetLocationOnNativeScreen() const OVERRIDE;
   virtual void SetCursor(gfx::NativeCursor cursor_type) OVERRIDE;
   virtual gfx::Point QueryMouseLocation() OVERRIDE;
   virtual void PostNativeEvent(const base::NativeEvent& event) OVERRIDE;
 
+  // base::MessagePumpObserver Overrides.
+  virtual base::EventStatus WillProcessEvent(
+      const base::NativeEvent& event) OVERRIDE;
+  virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE;
+  virtual void DestroyMessagePump() OVERRIDE;
+
   // Returns true if there's an X window manager present... in most cases.  Some
   // window managers (notably, ion3) don't implement enough of ICCCM for us to
   // detect that they're there.
   bool IsWindowManagerPresent();
 
   Desktop* desktop_;
 
   // The display and the native X window hosting the desktop.
   Display* xdisplay_;
   ::Window xwindow_;
@@ skipping 24 matching lines @@
                     StructureNotifyMask | PropertyChangeMask |
                     PointerMotionMask;
   XSelectInput(xdisplay_, xwindow_, event_mask);
   XFlush(xdisplay_);
 
   // TODO(sadrul): reenable once 103981 is fixed.
 #if defined(TOUCH_UI)
   if (base::MessagePumpForUI::HasXInput2())
     ui::TouchFactory::GetInstance()->SetupXI2ForXWindow(xwindow_);
 #endif
+
+  base::MessagePumpX::SetDefaultDispatcher(this);
+  MessageLoopForUI::current()->AddObserver(this);
 }
 
 DesktopHostLinux::~DesktopHostLinux() {
   XDestroyWindow(xdisplay_, xwindow_);
 
   // Clears XCursorCache.
   ui::GetXCursor(ui::kCursorClearXCursorCache);
+
+  base::MessagePumpX::SetDefaultDispatcher(NULL);
+  if (MessageLoop::current())
+    MessageLoopForUI::current()->RemoveObserver(this);

[oshima, 2011/11/30 00:04:16]

nit: it may be better to put them in reverse order to match the order in
constructor.

[sadrul, 2011/11/30 13:54:58]

Done.

 }
 
 base::MessagePumpDispatcher::DispatchStatus DesktopHostLinux::Dispatch(
     XEvent* xev) {
   bool handled = false;
   switch (xev->type) {
     case Expose:
       desktop_->Draw();
       handled = true;
       break;
@@ skipping 206 matching lines @@
       desktop_->ConvertPointToNativeScreen(&point);
       xevent.xmotion.x_root = point.x();
       xevent.xmotion.y_root = point.y();
     }
     default:
       break;
   }
   XSendEvent(xdisplay_, xwindow_, False, 0, &xevent);
 }
 
+base::EventStatus DesktopHostLinux::WillProcessEvent(
+    const base::NativeEvent& event) {
+  return base::EVENT_CONTINUE;
+}
+
+void DesktopHostLinux::DidProcessEvent(const base::NativeEvent& event) {
+}
+
+void DesktopHostLinux::DestroyMessagePump() {
+  desktop_->DeleteInstance();
+}
+
 bool DesktopHostLinux::IsWindowManagerPresent() {
   // Per ICCCM 2.8, "Manager Selections", window managers should take ownership
   // of WM_Sn selections (where n is a screen number).
   ::Atom wm_s0_atom = XInternAtom(xdisplay_, "WM_S0", False);
   return XGetSelectionOwner(xdisplay_, wm_s0_atom) != None;
 }
 
 }  // namespace
 
 // static
 DesktopHost* DesktopHost::Create(const gfx::Rect& bounds) {
   return new DesktopHostLinux(bounds);
 }
 
 // static
 gfx::Size DesktopHost::GetNativeDisplaySize() {
   ::Display* xdisplay = base::MessagePumpX::GetDefaultXDisplay();
   return gfx::Size(DisplayWidth(xdisplay, 0), DisplayHeight(xdisplay, 0));
 }
 
 }  // namespace aura