aura: Fix unit_tests on linux

ui/aura/desktop.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.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 14 matching lines @@
 #include "ui/aura/window_delegate.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/compositor/compositor.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/layer_animator.h"
 
 #ifdef USE_WEBKIT_COMPOSITOR
 #include "ui/gfx/compositor/compositor_cc.h"
 #endif
 
-#if defined(USE_X11)
-#include "base/message_pump_x.h"
-#endif
-
 using std::string;
 using std::vector;
 
 namespace aura {
 
 namespace {
 
 // Default bounds for the host window.
 static const int kDefaultHostWindowX = 200;
 static const int kDefaultHostWindowY = 200;
@@ skipping 368 matching lines @@
   if (ui::Compositor::compositor_factory()) {
     compositor_ = (*ui::Compositor::compositor_factory())(this);
   } else {
 #ifdef USE_WEBKIT_COMPOSITOR
     ui::CompositorCC::Initialize(false);
 #endif
     compositor_ = ui::Compositor::Create(this, host_->GetAcceleratedWidget(),
                                          host_->GetSize());
   }
   DCHECK(compositor_.get());
-#if defined(USE_X11)
-  base::MessagePumpX::SetDefaultDispatcher(host_.get());
-#endif
 }
 
 Desktop::~Desktop() {
-#if defined(USE_X11)
-  base::MessagePumpX::SetDefaultDispatcher(NULL);
-#endif
-
   in_destructor_ = true;
 #ifdef USE_WEBKIT_COMPOSITOR
   if (!ui::Compositor::compositor_factory())
     ui::CompositorCC::Terminate();
 #endif
   if (instance_ == this)
     instance_ = NULL;
 }
 
 void Desktop::HandleMouseMoved(const MouseEvent& event, Window* target) {
@@ skipping 155 matching lines @@
       base::StringToInt(parts[1], &parsed_height) && parsed_height > 0) {
     bounds.set_size(gfx::Size(parsed_width, parsed_height));
   } else if (use_fullscreen_host_window_) {
     bounds = gfx::Rect(DesktopHost::GetNativeDisplaySize());
   }
 
   return bounds;
 }
 
 }  // namespace aura