OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h" | 5 #include "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h" |
6 | 6 |
7 #include "ash/wm/property_util.h" | 7 #include "ash/wm/property_util.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/callback.h" | 9 #include "base/callback.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
147 using test::GetTabStripForBrowser; | 147 using test::GetTabStripForBrowser; |
148 | 148 |
149 TabDragControllerTest::TabDragControllerTest() | 149 TabDragControllerTest::TabDragControllerTest() |
150 : native_browser_list(BrowserList::GetInstance( | 150 : native_browser_list(BrowserList::GetInstance( |
151 chrome::HOST_DESKTOP_TYPE_NATIVE)) { | 151 chrome::HOST_DESKTOP_TYPE_NATIVE)) { |
152 } | 152 } |
153 | 153 |
154 TabDragControllerTest::~TabDragControllerTest() { | 154 TabDragControllerTest::~TabDragControllerTest() { |
155 } | 155 } |
156 | 156 |
| 157 void TabDragControllerTest::SetUp() { |
| 158 // TODO(danakj): Remove this when the tests are not flaky (crbug.com/270065) |
| 159 // or we use test contexts in the renderer to keep things fast enough to |
| 160 // avoid the flake (crbug.com/270918). |
| 161 UseRealGLBindings(); |
| 162 |
| 163 InProcessBrowserTest::SetUp(); |
| 164 } |
| 165 |
157 void TabDragControllerTest::StopAnimating(TabStrip* tab_strip) { | 166 void TabDragControllerTest::StopAnimating(TabStrip* tab_strip) { |
158 tab_strip->StopAnimating(true); | 167 tab_strip->StopAnimating(true); |
159 } | 168 } |
160 | 169 |
161 void TabDragControllerTest::AddTabAndResetBrowser(Browser* browser) { | 170 void TabDragControllerTest::AddTabAndResetBrowser(Browser* browser) { |
162 AddBlankTabAndShow(browser); | 171 AddBlankTabAndShow(browser); |
163 StopAnimating(GetTabStripForBrowser(browser)); | 172 StopAnimating(GetTabStripForBrowser(browser)); |
164 ResetIDs(browser->tab_strip_model(), 0); | 173 ResetIDs(browser->tab_strip_model(), 0); |
165 } | 174 } |
166 | 175 |
(...skipping 1610 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1777 DifferentDeviceScaleFactorDisplayTabDragControllerTest, | 1786 DifferentDeviceScaleFactorDisplayTabDragControllerTest, |
1778 ::testing::Values("mouse")); | 1787 ::testing::Values("mouse")); |
1779 INSTANTIATE_TEST_CASE_P(TabDragging, | 1788 INSTANTIATE_TEST_CASE_P(TabDragging, |
1780 DetachToBrowserTabDragControllerTest, | 1789 DetachToBrowserTabDragControllerTest, |
1781 ::testing::Values("mouse", "touch")); | 1790 ::testing::Values("mouse", "touch")); |
1782 #else | 1791 #else |
1783 INSTANTIATE_TEST_CASE_P(TabDragging, | 1792 INSTANTIATE_TEST_CASE_P(TabDragging, |
1784 DetachToBrowserTabDragControllerTest, | 1793 DetachToBrowserTabDragControllerTest, |
1785 ::testing::Values("mouse")); | 1794 ::testing::Values("mouse")); |
1786 #endif | 1795 #endif |
OLD | NEW |