OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "chrome/browser/browser.h" | 6 #include "chrome/browser/browser.h" |
7 #include "chrome/browser/debugger/devtools_client_host.h" | 7 #include "chrome/browser/debugger/devtools_client_host.h" |
8 #include "chrome/browser/debugger/devtools_manager.h" | 8 #include "chrome/browser/debugger/devtools_manager.h" |
9 #include "chrome/browser/debugger/devtools_window.h" | 9 #include "chrome/browser/debugger/devtools_window.h" |
10 #include "chrome/browser/extensions/extension_host.h" | 10 #include "chrome/browser/extensions/extension_host.h" |
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
397 #if defined(OS_WIN) || defined(OS_LINUX) | 397 #if defined(OS_WIN) || defined(OS_LINUX) |
398 // Disabled on WIN because it times out. See http://crbug.com/45080 | 398 // Disabled on WIN because it times out. See http://crbug.com/45080 |
399 // Disabled on Linux as well after WebKit r60965, See http://crbug.com/46299 | 399 // Disabled on Linux as well after WebKit r60965, See http://crbug.com/46299 |
400 #define MAYBE_TestStepIn DISABLED_TestStepIn | 400 #define MAYBE_TestStepIn DISABLED_TestStepIn |
401 #elif defined(OS_CHROMEOS) | 401 #elif defined(OS_CHROMEOS) |
402 // See http://crbug.com/43479 | 402 // See http://crbug.com/43479 |
403 #define MAYBE_TestStepIn FLAKY_TestStepIn | 403 #define MAYBE_TestStepIn FLAKY_TestStepIn |
404 #else | 404 #else |
405 #define MAYBE_TestStepIn TestStepIn | 405 #define MAYBE_TestStepIn TestStepIn |
406 #endif | 406 #endif |
| 407 // Disable TestStepIn completely while test expectations are not updated |
| 408 // in Webkit. See http://crbug.com/46235 |
| 409 #undef MAYBE_TestStepIn |
| 410 #define MAYBE_TestStepIn DISABLED_TestStepIn |
| 411 |
407 // Tests step in functionality in the debugger. | 412 // Tests step in functionality in the debugger. |
408 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestStepIn) { | 413 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestStepIn) { |
409 RunTest("testStepIn", kDebuggerStepTestPage); | 414 RunTest("testStepIn", kDebuggerStepTestPage); |
410 } | 415 } |
411 | 416 |
412 // Tests that scope can be expanded and contains expected variables. | 417 // Tests that scope can be expanded and contains expected variables. |
413 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestExpandScope) { | 418 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestExpandScope) { |
414 RunTest("testExpandScope", kDebuggerClosurePage); | 419 RunTest("testExpandScope", kDebuggerClosurePage); |
415 } | 420 } |
416 | 421 |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
450 RunTest("testEvalGlobal", kEvalTestPage); | 455 RunTest("testEvalGlobal", kEvalTestPage); |
451 } | 456 } |
452 | 457 |
453 // Test that Storage panel can be shown. | 458 // Test that Storage panel can be shown. |
454 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestShowStoragePanel) { | 459 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestShowStoragePanel) { |
455 RunTest("testShowStoragePanel", kDebuggerTestPage); | 460 RunTest("testShowStoragePanel", kDebuggerTestPage); |
456 } | 461 } |
457 | 462 |
458 | 463 |
459 } // namespace | 464 } // namespace |
OLD | NEW |