Nukes USE_AURA ifdefs from views

ui/views/touchui/touch_selection_controller_impl_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 "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
+#include "ui/aura/test/event_generator.h"
+#include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/touch/touch_editing_controller.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/render_text.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/touchui/touch_selection_controller_impl.h"
 #include "ui/views/widget/widget.h"
 
-#if defined(USE_AURA)
-#include "ui/aura/test/event_generator.h"
-#include "ui/aura/window.h"
-#endif
-
 using base::ASCIIToUTF16;
 using base::UTF16ToUTF8;
 using base::WideToUTF16;
 
 namespace {
 // Should match kSelectionHandlePadding in touch_selection_controller.
 const int kPadding = 10;
 
 gfx::Image* GetHandleImage() {
   static gfx::Image* handle_image = NULL;
@@ skipping 423 matching lines @@
   size_t visible_handle_position = textfield_->GetSelectedRange().end();
   for (int i = 0; i < 10; ++i) {
     SimulateSelectionHandleDrag(gfx::Point(-10, 0), 2);
     // Make sure that the visible handle is being dragged.
     EXPECT_NE(visible_handle_position, textfield_->GetSelectedRange().end());
     visible_handle_position = textfield_->GetSelectedRange().end();
     EXPECT_EQ((size_t) 10, textfield_->GetSelectedRange().start());
   }
 }
 
-#if defined(USE_AURA)
 TEST_F(TouchSelectionControllerImplTest,
        DoubleTapInTextfieldWithCursorHandleShouldSelectWord) {
   CreateTextfield();
   textfield_->SetText(ASCIIToUTF16("some text"));
   aura::test::EventGenerator generator(
       textfield_->GetWidget()->GetNativeView()->GetRootWindow());
 
   // Tap the textfield to invoke touch selection.
   generator.GestureTapAt(gfx::Point(10, 10));
 
   // Cursor handle should be visible.
   EXPECT_FALSE(textfield_->HasSelection());
   VERIFY_HANDLE_POSITIONS(false);
 
   // Double tap on the cursor handle position. We want to check that the cursor
   // handle is not eating the event and that the event is falling through to the
   // textfield.
   gfx::Point cursor_pos = GetCursorHandlePosition();
   cursor_pos.Offset(GetHandleImageSize().width() / 2 + kPadding, 0);
   generator.GestureTapAt(cursor_pos);
   generator.GestureTapAt(cursor_pos);
   EXPECT_TRUE(textfield_->HasSelection());
   VERIFY_HANDLE_POSITIONS(false);
 }
-#endif
 
 }  // namespace views