Explicitly hardcode tab_drag_controller_interactive_uitest.cc to use the native desktop list.

chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.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 "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_list_impl.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/tabs/tab.h"
 #include "chrome/browser/ui/views/tabs/tab_drag_controller.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/interactive_test_utils.h"
@@ skipping 99 matching lines @@
   ASSERT_TRUE(ui_controls::SendMouseMove(
       tab_0_center.x(), tab_0_center.y() + tab_strip->height() + 20));
   ASSERT_TRUE(ui_test_utils::SendMouseEventsSync(
                   ui_controls::LEFT, ui_controls::UP));
 
   // Should no longer be dragging.
   ASSERT_FALSE(tab_strip->IsDragSessionActive());
   ASSERT_FALSE(TabDragController::IsActive());
 
   // There should now be another browser.
-  ASSERT_EQ(2u, BrowserList::size());
-  Browser* new_browser = *(++BrowserList::begin());
+  ASSERT_EQ(2u, native_browser_list->size());
+  Browser* new_browser = native_browser_list->get(1);
   ASSERT_TRUE(new_browser->window()->IsActive());
   TabStrip* tab_strip2 = GetTabStripForBrowser(new_browser);
   ASSERT_FALSE(tab_strip2->IsDragSessionActive());
 
   EXPECT_EQ("0", IDString(new_browser->tab_strip_model()));
   EXPECT_EQ("1", IDString(browser()->tab_strip_model()));
 }
 
 // Deletes a tab being dragged before the user moved enough to start a drag.
 IN_PROC_BROWSER_TEST_F(TabDragControllerTest, DeleteBeforeStartedDragging) {
@@ skipping 96 matching lines @@
   // Should still be dragging.
   ASSERT_TRUE(tab_strip->IsDragSessionActive());
   ASSERT_TRUE(TabDragController::IsActive());
 
   // Release the mouse.
   ASSERT_TRUE(ui_test_utils::SendMouseEventsSync(
                   ui_controls::LEFT, ui_controls::UP));
 
   // Releasing the mouse should destroy the existing browser and create a new
   // one.
-  ASSERT_EQ(1u, BrowserList::size());
-  Browser* new_browser = *BrowserList::begin();
+  ASSERT_EQ(1u, native_browser_list->size());
+  Browser* new_browser = native_browser_list->get(0);
   EXPECT_NE(new_browser, browser());
 
   ASSERT_FALSE(GetTabStripForBrowser(new_browser)->IsDragSessionActive());
   ASSERT_FALSE(TabDragController::IsActive());
 
   EXPECT_EQ("0", IDString(new_browser->tab_strip_model()));
 }
 
 // Creates two browsers, selects all tabs in first and drags into second.
 IN_PROC_BROWSER_TEST_F(TabDragControllerTest, DragAllToSeparateWindow) {
@@ skipping 16 matching lines @@
   ASSERT_TRUE(ui_test_utils::SendMouseMoveSync(tab_0_center));
   ASSERT_TRUE(ui_test_utils::SendMouseEventsSync(
                   ui_controls::LEFT, ui_controls::DOWN));
   ASSERT_TRUE(ui_test_utils::SendMouseMoveSync(
                   gfx::Point(tab_0_center.x(),
                              tab_0_center.y() + tab_strip->height() + 20)));
 
   ASSERT_TRUE(tab_strip->IsDragSessionActive());
   ASSERT_FALSE(tab_strip2->IsDragSessionActive());
   ASSERT_TRUE(TabDragController::IsActive());
-  ASSERT_EQ(2u, BrowserList::size());
+  ASSERT_EQ(2u, native_browser_list->size());
 
   // Drag to tab_strip2.
   gfx::Point target_point(tab_strip2->width() - 1,
                           tab_strip2->height() / 2);
   views::View::ConvertPointToScreen(tab_strip2, &target_point);
   ASSERT_TRUE(ui_controls::SendMouseMove(target_point.x(), target_point.y()));
 
   // Should now be attached to tab_strip2.
   ASSERT_TRUE(tab_strip->IsDragSessionActive());
   ASSERT_TRUE(TabDragController::IsActive());
@@ skipping 27 matching lines @@
       GetCenterInScreenCoordinates(tab_strip->tab_at(0)));
   ASSERT_TRUE(ui_test_utils::SendMouseMoveSync(tab_0_center));
   ASSERT_TRUE(ui_test_utils::SendMouseEventsSync(
                   ui_controls::LEFT, ui_controls::DOWN));
   ASSERT_TRUE(ui_test_utils::SendMouseMoveSync(
                   gfx::Point(tab_0_center.x(),
                              tab_0_center.y() + tab_strip->height() + 20)));
   ASSERT_TRUE(tab_strip->IsDragSessionActive());
   ASSERT_FALSE(tab_strip2->IsDragSessionActive());
   ASSERT_TRUE(TabDragController::IsActive());
-  ASSERT_EQ(2u, BrowserList::size());
+  ASSERT_EQ(2u, native_browser_list->size());
 
   // Drag to tab_strip2.
   gfx::Point target_point(tab_strip2->width() - 1,
                           tab_strip2->height() / 2);
   views::View::ConvertPointToScreen(tab_strip2, &target_point);
   ASSERT_TRUE(ui_controls::SendMouseMove(target_point.x(), target_point.y()));
 
   ASSERT_TRUE(tab_strip->IsDragSessionActive());
   ASSERT_TRUE(TabDragController::IsActive());
-  ASSERT_EQ(2u, BrowserList::size());
+  ASSERT_EQ(2u, native_browser_list->size());
 
   // Cancel the drag.
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
       browser2, ui::VKEY_ESCAPE, false, false, false, false));
 
   ASSERT_FALSE(tab_strip->IsDragSessionActive());
   ASSERT_FALSE(tab_strip2->IsDragSessionActive());
   ASSERT_FALSE(TabDragController::IsActive());
-  ASSERT_EQ(2u, BrowserList::size());
+  ASSERT_EQ(2u, native_browser_list->size());
   EXPECT_EQ("0 1", IDString(browser()->tab_strip_model()));
   EXPECT_EQ("100", IDString(browser2->tab_strip_model()));
 }