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

chrome/browser/ui/views/tabs/tab_strip.h

Index: chrome/browser/ui/views/tabs/tab_strip.h
===================================================================
--- chrome/browser/ui/views/tabs/tab_strip.h	(revision 135842)
+++ chrome/browser/ui/views/tabs/tab_strip.h	(working copy)
@@ -222,9 +222,8 @@
 
   class RemoveTabDelegate;
 
-  friend class DefaultTabDragController;
-  friend class TabDragController2;
-  friend class TabDragController2Test;
+  friend class TabDragController;
+  friend class TabDragControllerTest;
 
   // Used during a drop session of a url. Tracks the position of the drop as
   // well as a window used to highlight where the drop occurs.