Nukes USE_AURA ifdefs from views

ui/views/controls/native/native_view_host_unittest.cc

 // 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.
 
 #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 {
  public:
   NativeViewHostTest() {
   }
 
   virtual void SetUp() OVERRIDE {
     ViewsTestBase::SetUp();
 
@@ skipping 56 matching lines @@
     ++notification_count_;
     View::NativeViewHierarchyChanged();
   }
 
  private:
   int notification_count_;
 
   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:
   ViewHierarchyChangedTestHost()
       : num_parent_changes_(0) {
   }
 
   void ResetParentChanges() {
     num_parent_changes_ = 0;
   }
@@ skipping 174 matching lines @@
   host0->ResetParentChanges();
   host1->ResetParentChanges();
   EXPECT_EQ(0, host0->num_parent_changes());
   EXPECT_EQ(0, host1->num_parent_changes());
   child0->GetContentsView()->AddChildView(view1);
   EXPECT_EQ(0, host0->num_parent_changes());
   EXPECT_EQ(2, host1->num_parent_changes());
 }
 
 }  // namespace views