Mac Aura fails compile and some tests

ui/aura/env.h

 // Copyright (c) 2012 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.
 
 #ifndef UI_AURA_ENV_H_
 #define UI_AURA_ENV_H_
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/observer_list.h"
 #include "ui/aura/aura_export.h"
 #include "ui/aura/client/stacking_client.h"
 
 namespace aura {
 
 class EnvObserver;
 class Window;
 
+#if !defined(OS_MACOSX)
 class Dispatcher : public MessageLoop::Dispatcher {
  public:
   virtual ~Dispatcher() {}
 };
 
-#if !defined(OS_MACOSX)
 // Creates a platform-specific native event dispatcher.
 Dispatcher* CreateDispatcher();
 #endif
 
 // A singleton object that tracks general state within Aura.
 // TODO(beng): manage RootWindows.
 class AURA_EXPORT Env {
  public:
   Env();
   ~Env();
@@ skipping 36 matching lines @@
   static Env* instance_;
   int mouse_button_flags_;
   client::StackingClient* stacking_client_;
 
   DISALLOW_COPY_AND_ASSIGN(Env);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_ENV_H_