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

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

Getting rid of some of the last BrowserList:: iterator methods :)!

Also making BrowserListImpl const-safe (otherwise GetLastActive(), required in this CL, couldn't be used on a const BrowserListImpl*).

BUG=129187
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=181984

[gab, 2013-02-08 19:18:59]

Ben, please take a look. I think this is the last one to be able to delete
BrowserList:: native-desktop-only iterators!

Cheers!
Gab

[gab, 2013-02-11 15:38:33]

On 2013/02/08 19:18:59, gab wrote:
> Ben, please take a look. I think this is the last one to be able to delete
> BrowserList:: native-desktop-only iterators!
> 
> Cheers!
> Gab

@ben: ping

Thanks,
Gab

[gab, 2013-02-11 23:08:31]

Swapping ben for sky.

Thanks!
Gab

[sky, 2013-02-12 00:54:51]

LGTM

[commit-bot: I haz the power, 2013-02-12 02:41:01]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/gab@chromium.org/12213091/10006

[commit-bot: I haz the power, 2013-02-12 02:41:03]

Failed to apply patch for
chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file
chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
  Hunk #1 succeeded at 11 with fuzz 2.
  Hunk #2 FAILED at 21.
  Hunk #3 FAILED at 41.
  2 out of 27 hunks FAILED -- saving rejects to file
chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc.rej

Patch:      
chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
Index: chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
diff --git
a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
index
375db01da3df8ba7a43b0e6159fca9caf1207c16..0a52fe7a73d3ff15fe8e62b0e2a5e740fed15b33
100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
@@ -11,7 +11,9 @@
 #include "base/run_loop.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_iterator.h"
+#include "chrome/browser/ui/browser_list_impl.h"
+#include "chrome/browser/ui/host_desktop.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"
@@ -19,8 +21,8 @@
 #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/interactive_test_utils.h"
 #include "chrome/test/base/in_process_browser_test.h"
+#include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/ui_controls.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_details.h"
@@ -39,8 +41,8 @@
 #include "ash/test/cursor_manager_test_api.h"
 #include "ash/wm/cursor_manager.h"
 #include "ash/wm/window_util.h"
-#include "ui/aura/test/event_generator.h"
 #include "ui/aura/root_window.h"
+#include "ui/aura/test/event_generator.h"
 #endif
 
 using content::WebContents;
@@ -140,7 +142,9 @@ using test::ResetIDs;
 using test::IDString;
 using test::GetTabStripForBrowser;
 
-TabDragControllerTest::TabDragControllerTest() {
+TabDragControllerTest::TabDragControllerTest()
+    : native_browser_list(chrome::BrowserListImpl::GetInstance(
+                              chrome::HOST_DESKTOP_TYPE_NATIVE)) {
 }
 
 TabDragControllerTest::~TabDragControllerTest() {
@@ -445,8 +449,8 @@ IN_PROC_BROWSER_TEST_P(DetachToBrowserTabDragControllerTest,
   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());
@@ -559,9 +563,10 @@
IN_PROC_BROWSER_TEST_P(DetachToBrowserTabDragControllerTest,
 
 namespace {
 
-void DeleteSourceDetachedStep2(WebContents* tab) {
-  ASSERT_EQ(2u, BrowserList::size());
-  Browser* new_browser = *(++BrowserList::begin());
+void DeleteSourceDetachedStep2(WebContents* tab,
+                               const chrome::BrowserListImpl* browser_list) {
+  ASSERT_EQ(2u, browser_list->size());
+  Browser* new_browser = browser_list->get(1);
   // This ends up closing the source window.
   delete tab;
   // Cancel the drag.
@@ -585,12 +590,12 @@
IN_PROC_BROWSER_TEST_P(DetachToBrowserTabDragControllerTest,
   ASSERT_TRUE(PressInput(tab_0_center));
   ASSERT_TRUE(DragInputToNotifyWhenDone(
       tab_0_center.x(), tab_0_center.y() + GetDetachY(tab_strip),
-      base::Bind(&DeleteSourceDetachedStep2, to_delete)));
+      base::Bind(&DeleteSourceDetachedStep2, to_delete, native_browser_list)));
   QuitWhenNotDragging();
 
   // Should not be dragging.
-  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);
   ASSERT_FALSE(GetTabStripForBrowser(new_browser)->IsDragSessionActive());
   ASSERT_FALSE(TabDragController::IsActive());
 
@@ -601,9 +606,10 @@
IN_PROC_BROWSER_TEST_P(DetachToBrowserTabDragControllerTest,
 
 namespace {
 
-void PressEscapeWhileDetachedStep2() {
-  ASSERT_EQ(2u, BrowserList::size());
-  Browser* new_browser = *(++BrowserList::begin());
+void PressEscapeWhileDetachedStep2(
+    const chrome::BrowserListImpl* browser_list) {
+  ASSERT_EQ(2u, browser_list->size());
+  Browser* new_browser = browser_list->get(1);
   ui_controls::SendKeyPress(
       new_browser->window()->GetNativeWindow(), ui::VKEY_ESCAPE, false, false,
       false, false);
@@ -624,7 +630,7 @@ IN_PROC_BROWSER_TEST_P(DetachToBrowserTabDragControllerTest,
   ASSERT_TRUE(PressInput(tab_0_center));
   ASSERT_TRUE(DragInputToNotifyWhenDone(
       tab_0_center.x(), tab_0_center.y() + GetDetachY(tab_strip),
-      base::Bind(&PressEscapeWhileDetachedStep2)));
+      base::Bind(&PressEscapeWhileDetachedStep2, native_browser_list)));
   QuitWhenNotDragging();
 
   // Should not be dragging.
@@ -632,16 +638,17 @@
IN_PROC_BROWSER_TEST_P(DetachToBrowserTabDragControllerTest,
   ASSERT_FALSE(TabDragController::IsActive());
 
   // And there should only be one window.
-  EXPECT_EQ(1u, BrowserList::size());
+  EXPECT_EQ(1u, native_browser_list->size());
 
   EXPECT_EQ("0 1", IDString(browser()->tab_strip_model()));
 }
 
 namespace {
 
-void DragAllStep2(DetachToBrowserTabDragControllerTest* test) {
+void DragAllStep2(DetachToBrowserTabDragControllerTest* test,
+                  const chrome::BrowserListImpl* browser_list) {
   // Should only be one window.
-  ASSERT_EQ(1u, BrowserList::size());
+  ASSERT_EQ(1u, browser_list->size());
   if (test->input_source() == INPUT_SOURCE_TOUCH) {
     ASSERT_TRUE(test->ReleaseInput());
   } else {
@@ -665,7 +672,7 @@ IN_PROC_BROWSER_TEST_P(DetachToBrowserTabDragControllerTest,
DragAll) {
   ASSERT_TRUE(PressInput(tab_0_center));
   ASSERT_TRUE(DragInputToNotifyWhenDone(
       tab_0_center.x(), tab_0_center.y() + GetDetachY(tab_strip),
-      base::Bind(&DragAllStep2, this)));
+      base::Bind(&DragAllStep2, this, native_browser_list)));
   QuitWhenNotDragging();
 
   // Should not be dragging.
@@ -673,7 +680,7 @@ IN_PROC_BROWSER_TEST_P(DetachToBrowserTabDragControllerTest,
DragAll) {
   ASSERT_FALSE(TabDragController::IsActive());
 
   // And there should only be one window.
-  EXPECT_EQ(1u, BrowserList::size());
+  EXPECT_EQ(1u, native_browser_list->size());
 
   EXPECT_EQ("0 1", IDString(browser()->tab_strip_model()));
 
@@ -685,11 +692,12 @@ namespace {
 // Invoked from the nested message loop.
 void DragAllToSeparateWindowStep2(DetachToBrowserTabDragControllerTest* test,
                                   TabStrip* attached_tab_strip,
-                                  TabStrip* target_tab_strip) {
+                                  TabStrip* target_tab_strip,
+                                  const chrome::BrowserListImpl* browser_list)
{
   ASSERT_TRUE(attached_tab_strip->IsDragSessionActive());
   ASSERT_FALSE(target_tab_strip->IsDragSessionActive());
   ASSERT_TRUE(TabDragController::IsActive());
-  ASSERT_EQ(2u, BrowserList::size());
+  ASSERT_EQ(2u, browser_list->size());
 
   // Drag to target_tab_strip. This should stop the nested loop from dragging
   // the window.
@@ -723,13 +731,14 @@
IN_PROC_BROWSER_TEST_P(DetachToBrowserTabDragControllerTest,
   ASSERT_TRUE(PressInput(tab_0_center));
   ASSERT_TRUE(DragInputToNotifyWhenDone(
       tab_0_center.x(), tab_0_center.y() + GetDetachY(tab_strip),
-      base::Bind(&DragAllToSeparateWindowStep2, this, tab_strip, tab_strip2)));
+      base::Bind(&DragAllToSeparateWindowStep2, this, tab_strip, tab_strip2,
+                 native_browser_list)));
   QuitWhenNotDragging();
 
   // Should now be attached to tab_strip2.
   ASSERT_TRUE(tab_strip2->IsDragSessionActive());
   ASSERT_TRUE(TabDragController::IsActive());
-  ASSERT_EQ(1u, BrowserList::size());
+  ASSERT_EQ(1u, native_browser_list->size());
 
   // Release the mouse, stopping the drag session.
   ASSERT_TRUE(ReleaseInput());
@@ -746,11 +755,12 @@ namespace {
 void DragAllToSeparateWindowAndCancelStep2(
     DetachToBrowserTabDragControllerTest* test,
     TabStrip* attached_tab_strip,
-    TabStrip* target_tab_strip) {
+    TabStrip* target_tab_strip,
+    const chrome::BrowserListImpl* browser_list) {
   ASSERT_TRUE(attached_tab_strip->IsDragSessionActive());
   ASSERT_FALSE(target_tab_strip->IsDragSessionActive());
   ASSERT_TRUE(TabDragController::IsActive());
-  ASSERT_EQ(2u, BrowserList::size());
+  ASSERT_EQ(2u, browser_list->size());
 
   // Drag to target_tab_strip. This should stop the nested loop from dragging
   // the window.
@@ -786,13 +796,13 @@
IN_PROC_BROWSER_TEST_P(DetachToBrowserTabDragControllerTest,
   ASSERT_TRUE(DragInputToNotifyWhenDone(
                   tab_0_center.x(), tab_0_center.y() + GetDetachY(tab_strip),
                   base::Bind(&DragAllToSeparateWindowAndCancelStep2, this,
-                             tab_strip, tab_strip2)));
+                             tab_strip, tab_strip2, native_browser_list)));
   QuitWhenNotDragging();
 
   // Should now be attached to tab_strip2.
   ASSERT_TRUE(tab_strip2->IsDragSessionActive());
   ASSERT_TRUE(TabDragController::IsActive());
-  ASSERT_EQ(1u, BrowserList::size());
+  ASSERT_EQ(1u, native_browser_list->size());
 
   // Cancel the drag.
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
@@ -803,7 +813,7 @@ IN_PROC_BROWSER_TEST_P(DetachToBrowserTabDragControllerTest,
   EXPECT_EQ("100 0 1", …
(message too large)

[commit-bot: I haz the power, 2013-02-12 03:34:54]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/gab@chromium.org/12213091/11018

[commit-bot: I haz the power, 2013-02-12 04:37:28]

Retried try job too often on mac_rel for step(s) interactive_ui_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...

[commit-bot: I haz the power, 2013-02-12 13:21:33]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/gab@chromium.org/12213091/11018

[commit-bot: I haz the power, 2013-02-12 14:12:37]

Retried try job too often on mac_rel for step(s) interactive_ui_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...

[commit-bot: I haz the power, 2013-02-12 15:37:32]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/gab@chromium.org/12213091/11018

[commit-bot: I haz the power, 2013-02-12 16:28:27]

Retried try job too often on mac_rel for step(s) browser_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...

[gab, 2013-02-12 20:02:56]

On 2013/02/12 16:28:27, I haz the power (commit-bot) wrote:
> Retried try job too often on mac_rel for step(s) browser_tests
>
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...

The mac_rel errors didn't seem related (I think the try bots for mac_rel are
flaky for interactive_ui_tests; other recent commits of mine didn't run those
tests because the CQ detected they weren't related so I can't compare...). The
mac:interactive_ui_tests are working fine so even if my new code somehow made
things slower to the point of causing flakiness I don't see how debug builds
would work and not release...

dcommitted this; if there are mac_rel:interactive_ui_tests issues on the
waterfall after this, please revert.

Cheers!
Gab