Nukes USE_AURA ifdefs from views

ui/views/controls/native/native_view_host_unittest.cc

Index: ui/views/controls/native/native_view_host_unittest.cc
diff --git a/ui/views/controls/native/native_view_host_unittest.cc b/ui/views/controls/native/native_view_host_unittest.cc
index f30980bca8bad31eb9c4e2b9a46d89f7ae317892..247782437a5022d0d45cc68ee4277789ca2b69b1 100644
--- a/ui/views/controls/native/native_view_host_unittest.cc
+++ b/ui/views/controls/native/native_view_host_unittest.cc
@@ -4,19 +4,12 @@
 
 #include "ui/views/controls/native/native_view_host.h"
 
-#if defined(OS_WIN) && !defined(USE_AURA)
-#include <windows.h>
-#endif
-
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
+#include "ui/aura/window.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 
-#if defined(USE_AURA)
-#include "ui/aura/window.h"
-#endif
-
 namespace views {
 
 class NativeViewHostTest : public ViewsTestBase {
@@ -93,15 +86,9 @@ class NativeViewHierarchyChangedTestView : public View {
   DISALLOW_COPY_AND_ASSIGN(NativeViewHierarchyChangedTestView);
 };
 
-#if defined(USE_AURA)
 aura::Window* GetNativeParent(aura::Window* window) {
   return window->parent();
 }
-#elif defined(OS_WIN)
-HWND GetNativeParent(HWND window) {
-  return GetParent(window);
-}
-#endif
 
 class ViewHierarchyChangedTestHost : public NativeViewHost {
  public: