Revert of MacViews: Better layering for the touch selection controller

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/client/screen_position_client.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/touch_selection_controller_factory.h"
 #include "ui/views/touchui/touch_selection_controller_impl.h"
 #include "ui/views/widget/widget.h"
 
 using base::ASCIIToUTF16;
 using base::UTF16ToUTF8;
 using base::WideToUTF16;
 
 namespace {
 // Should match kSelectionHandlePadding in touch_selection_controller.
 const int kPadding = 10;
@@ skipping 671 matching lines @@
   // Move the first window to top and check that the handle is kept above the
   // first window.
   window1->GetRootWindow()->StackChildAtTop(window1);
   ui::MouseEvent test_event3(ui::ET_MOUSE_MOVED, test_point, test_point,
                              ui::EF_NONE, ui::EF_NONE);
   EXPECT_EQ(GetCursorHandleNativeView(),
             targeter->FindTargetForEvent(root, &test_event3));
 }
 
 }  // namespace views