Unifies the two tab dragging variants. I would have liked to better

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
===================================================================
--- chrome/chrome_tests.gypi	(revision 135842)
+++ chrome/chrome_tests.gypi	(working copy)
@@ -515,8 +515,9 @@
         'browser/ui/views/menu_item_view_test.cc',
         'browser/ui/views/menu_model_adapter_test.cc',
         'browser/ui/views/ssl_client_certificate_selector_browsertest.cc',
-        'browser/ui/views/tabs/tab_dragging_test.cc',
-        'browser/ui/views/tabs/tab_drag_controller2_interactive_uitest.cc',
+        'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h',
+        'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc',
+        'browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.cc',
         'browser/ui/webui/inspect_ui_browsertest.cc',
         'test/base/chrome_test_launcher.cc',
         'test/base/view_event_test_base.cc',
@@ -549,7 +550,6 @@
             'browser/ui/views/find_bar_host_interactive_uitest.cc',
             'browser/ui/views/menu_item_view_test.cc',
             'browser/ui/views/menu_model_adapter_test.cc',
-            'browser/ui/views/tabs/tab_dragging_test.cc',
             'test/base/view_event_test_base.cc',
             'test/base/view_event_test_base.h',
           ],
@@ -568,7 +568,6 @@
             'browser/ui/views/find_bar_host_interactive_uitest.cc',
             'browser/ui/views/menu_item_view_test.cc',
             'browser/ui/views/menu_model_adapter_test.cc',
-            'browser/ui/views/tabs/tab_dragging_test.cc',
             'browser/ui/views/tabs/tab_drag_controller2_interactive_uitest.cc',
             'test/base/view_event_test_base.cc',
             'test/base/view_event_test_base.h',