| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/cancelable_callback.h" | 10 #include "base/cancelable_callback.h" |
| (...skipping 1410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1421 #else | 1421 #else |
| 1422 #define MAYBE_TestScreenshotRecording TestScreenshotRecording | 1422 #define MAYBE_TestScreenshotRecording TestScreenshotRecording |
| 1423 #endif | 1423 #endif |
| 1424 IN_PROC_BROWSER_TEST_F(DevToolsPixelOutputTests, | 1424 IN_PROC_BROWSER_TEST_F(DevToolsPixelOutputTests, |
| 1425 MAYBE_TestScreenshotRecording) { | 1425 MAYBE_TestScreenshotRecording) { |
| 1426 RunTest("testScreenshotRecording", std::string()); | 1426 RunTest("testScreenshotRecording", std::string()); |
| 1427 } | 1427 } |
| 1428 | 1428 |
| 1429 // This test enables switches::kUseGpuInTests which causes false positives | 1429 // This test enables switches::kUseGpuInTests which causes false positives |
| 1430 // with MemorySanitizer. | 1430 // with MemorySanitizer. |
| 1431 #if defined(MEMORY_SANITIZER) || defined(ADDRESS_SANITIZER) || defined(OS_WIN) | 1431 // Flaky on Linux and Windows https://crbug.com/624215 |
| 1432 #if defined(MEMORY_SANITIZER) || defined(ADDRESS_SANITIZER) || \ |
| 1433 defined(OS_WIN) || defined(OS_LINUX) |
| 1432 #define MAYBE_TestLatencyInfoInstrumentation \ | 1434 #define MAYBE_TestLatencyInfoInstrumentation \ |
| 1433 DISABLED_TestLatencyInfoInstrumentation | 1435 DISABLED_TestLatencyInfoInstrumentation |
| 1434 #else | 1436 #else |
| 1435 #define MAYBE_TestLatencyInfoInstrumentation TestLatencyInfoInstrumentation | 1437 #define MAYBE_TestLatencyInfoInstrumentation TestLatencyInfoInstrumentation |
| 1436 #endif | 1438 #endif |
| 1437 IN_PROC_BROWSER_TEST_F(DevToolsPixelOutputTests, | 1439 IN_PROC_BROWSER_TEST_F(DevToolsPixelOutputTests, |
| 1438 MAYBE_TestLatencyInfoInstrumentation) { | 1440 MAYBE_TestLatencyInfoInstrumentation) { |
| 1439 WebContents* web_contents = GetInspectedTab(); | 1441 WebContents* web_contents = GetInspectedTab(); |
| 1440 OpenDevToolsWindow(kLatencyInfoTestPage, false); | 1442 OpenDevToolsWindow(kLatencyInfoTestPage, false); |
| 1441 DispatchAndWait("startTimeline"); | 1443 DispatchAndWait("startTimeline"); |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1548 | 1550 |
| 1549 DevToolsWindowTesting::CloseDevToolsWindowSync(window); | 1551 DevToolsWindowTesting::CloseDevToolsWindowSync(window); |
| 1550 content::WebUIControllerFactory::UnregisterFactoryForTesting(&test_factory); | 1552 content::WebUIControllerFactory::UnregisterFactoryForTesting(&test_factory); |
| 1551 } | 1553 } |
| 1552 | 1554 |
| 1553 // Tests scripts panel showing. | 1555 // Tests scripts panel showing. |
| 1554 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestDevToolsSharedWorker) { | 1556 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestDevToolsSharedWorker) { |
| 1555 RunTest("testDevToolsSharedWorker", url::kAboutBlankURL); | 1557 RunTest("testDevToolsSharedWorker", url::kAboutBlankURL); |
| 1556 } | 1558 } |
| 1557 | 1559 |
| OLD | NEW |