| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 <algorithm> | 5 #include <algorithm> |
| 6 #include <initializer_list> | 6 #include <initializer_list> |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 820 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 831 location_inside_web_contents); | 831 location_inside_web_contents); |
| 832 EXPECT_EQ(ui::DragDropTypes::DRAG_COPY, operation); | 832 EXPECT_EQ(ui::DragDropTypes::DRAG_COPY, operation); |
| 833 } | 833 } |
| 834 | 834 |
| 835 // Try to leave everything in a clean state. | 835 // Try to leave everything in a clean state. |
| 836 SimulateMouseUp(); | 836 SimulateMouseUp(); |
| 837 } | 837 } |
| 838 | 838 |
| 839 // There is no known way to execute test-controlled tasks during | 839 // There is no known way to execute test-controlled tasks during |
| 840 // a drag-and-drop loop run by Windows OS. | 840 // a drag-and-drop loop run by Windows OS. |
| 841 #if defined(OS_WIN) | 841 // Flaky on Linux. crbug.com/704603 |
| 842 #if defined(OS_WIN) || defined(OS_LINUX) |
| 842 #define MAYBE_DragImageBetweenFrames DISABLED_DragImageBetweenFrames | 843 #define MAYBE_DragImageBetweenFrames DISABLED_DragImageBetweenFrames |
| 843 #else | 844 #else |
| 844 #define MAYBE_DragImageBetweenFrames DragImageBetweenFrames | 845 #define MAYBE_DragImageBetweenFrames DragImageBetweenFrames |
| 845 #endif | 846 #endif |
| 846 | 847 |
| 847 // Data that needs to be shared across multiple test steps below | 848 // Data that needs to be shared across multiple test steps below |
| 848 // (i.e. across DragImageBetweenFrames_Step2 and DragImageBetweenFrames_Step3). | 849 // (i.e. across DragImageBetweenFrames_Step2 and DragImageBetweenFrames_Step3). |
| 849 struct DragAndDropBrowserTest::DragImageBetweenFrames_TestState { | 850 struct DragAndDropBrowserTest::DragImageBetweenFrames_TestState { |
| 850 DOMDragEventVerifier expected_dom_event_data; | 851 DOMDragEventVerifier expected_dom_event_data; |
| 851 std::unique_ptr<DOMDragEventWaiter> dragstart_event_waiter; | 852 std::unique_ptr<DOMDragEventWaiter> dragstart_event_waiter; |
| (...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1280 // of a drag operation, and cross-site drags should be allowed across a | 1281 // of a drag operation, and cross-site drags should be allowed across a |
| 1281 // navigation. | 1282 // navigation. |
| 1282 | 1283 |
| 1283 INSTANTIATE_TEST_CASE_P( | 1284 INSTANTIATE_TEST_CASE_P( |
| 1284 SameSiteSubframe, DragAndDropBrowserTest, ::testing::Values(false)); | 1285 SameSiteSubframe, DragAndDropBrowserTest, ::testing::Values(false)); |
| 1285 | 1286 |
| 1286 INSTANTIATE_TEST_CASE_P( | 1287 INSTANTIATE_TEST_CASE_P( |
| 1287 CrossSiteSubframe, DragAndDropBrowserTest, ::testing::Values(true)); | 1288 CrossSiteSubframe, DragAndDropBrowserTest, ::testing::Values(true)); |
| 1288 | 1289 |
| 1289 } // namespace chrome | 1290 } // namespace chrome |
| OLD | NEW |