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 "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/cancelable_callback.h" | 6 #include "base/cancelable_callback.h" |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
409 Browser* browser = window_->browser(); | 409 Browser* browser = window_->browser(); |
410 chrome::CloseAllTabs(browser); | 410 chrome::CloseAllTabs(browser); |
411 BrowserClosedObserver close_observer(browser); | 411 BrowserClosedObserver close_observer(browser); |
412 } | 412 } |
413 | 413 |
414 DevToolsWindow* window_; | 414 DevToolsWindow* window_; |
415 }; | 415 }; |
416 | 416 |
417 | 417 |
418 // Tests scripts panel showing. | 418 // Tests scripts panel showing. |
419 // Disabled: http://crbug.com/136313 | 419 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestShowScriptsTab) { |
420 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestShowScriptsTab) { | |
421 RunTest("testShowScriptsTab", kDebuggerTestPage); | 420 RunTest("testShowScriptsTab", kDebuggerTestPage); |
422 } | 421 } |
423 | 422 |
424 // Tests that scripts tab is populated with inspected scripts even if it | 423 // Tests that scripts tab is populated with inspected scripts even if it |
425 // hadn't been shown by the moment inspected paged refreshed. | 424 // hadn't been shown by the moment inspected paged refreshed. |
426 // @see http://crbug.com/26312 | 425 // @see http://crbug.com/26312 |
427 // Disabled: http://crbug.com/136313 | |
428 IN_PROC_BROWSER_TEST_F( | 426 IN_PROC_BROWSER_TEST_F( |
429 DevToolsSanityTest, | 427 DevToolsSanityTest, |
430 DISABLED_TestScriptsTabIsPopulatedOnInspectedPageRefresh) { | 428 TestScriptsTabIsPopulatedOnInspectedPageRefresh) { |
431 // Clear inspector settings to ensure that Elements will be | 429 // Clear inspector settings to ensure that Elements will be |
432 // current panel when DevTools window is open. | 430 // current panel when DevTools window is open. |
433 content::GetContentClient()->browser()->ClearInspectorSettings( | 431 content::GetContentClient()->browser()->ClearInspectorSettings( |
434 GetInspectedTab()->GetRenderViewHost()); | 432 GetInspectedTab()->GetRenderViewHost()); |
435 RunTest("testScriptsTabIsPopulatedOnInspectedPageRefresh", | 433 RunTest("testScriptsTabIsPopulatedOnInspectedPageRefresh", |
436 kDebuggerTestPage); | 434 kDebuggerTestPage); |
437 } | 435 } |
438 | 436 |
439 // Tests that chrome.devtools extension is correctly exposed. | 437 // Tests that chrome.devtools extension is correctly exposed. |
440 IN_PROC_BROWSER_TEST_F(DevToolsExtensionTest, | 438 IN_PROC_BROWSER_TEST_F(DevToolsExtensionTest, |
(...skipping 13 matching lines...) Expand all Loading... |
454 // Tests that chrome.experimental.devtools extension is correctly exposed | 452 // Tests that chrome.experimental.devtools extension is correctly exposed |
455 // when the extension has experimental permission. | 453 // when the extension has experimental permission. |
456 IN_PROC_BROWSER_TEST_F(DevToolsExperimentalExtensionTest, | 454 IN_PROC_BROWSER_TEST_F(DevToolsExperimentalExtensionTest, |
457 TestDevToolsExperimentalExtensionAPI) { | 455 TestDevToolsExperimentalExtensionAPI) { |
458 LoadExtension("devtools_experimental"); | 456 LoadExtension("devtools_experimental"); |
459 RunTest("waitForTestResultsInConsole", ""); | 457 RunTest("waitForTestResultsInConsole", ""); |
460 } | 458 } |
461 | 459 |
462 // Tests that a content script is in the scripts list. | 460 // Tests that a content script is in the scripts list. |
463 // http://crbug.com/114104 | 461 // http://crbug.com/114104 |
464 // Disabled: http://crbug.com/136313 | |
465 IN_PROC_BROWSER_TEST_F(DevToolsExtensionTest, | 462 IN_PROC_BROWSER_TEST_F(DevToolsExtensionTest, |
466 DISABLED_TestContentScriptIsPresent) { | 463 TestContentScriptIsPresent) { |
467 LoadExtension("simple_content_script"); | 464 LoadExtension("simple_content_script"); |
468 RunTest("testContentScriptIsPresent", kPageWithContentScript); | 465 RunTest("testContentScriptIsPresent", kPageWithContentScript); |
469 } | 466 } |
470 | 467 |
471 // Tests that scripts are not duplicated after Scripts Panel switch. | 468 // Tests that scripts are not duplicated after Scripts Panel switch. |
472 // Disabled: http://crbug.com/136313 | 469 // Disabled - see http://crbug.com/124300 |
473 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, | 470 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, |
474 DISABLED_TestNoScriptDuplicatesOnPanelSwitch) { | 471 TestNoScriptDuplicatesOnPanelSwitch) { |
475 RunTest("testNoScriptDuplicatesOnPanelSwitch", kDebuggerTestPage); | 472 RunTest("testNoScriptDuplicatesOnPanelSwitch", kDebuggerTestPage); |
476 } | 473 } |
477 | 474 |
478 // Tests that debugger works correctly if pause event occurs when DevTools | 475 // Tests that debugger works correctly if pause event occurs when DevTools |
479 // frontend is being loaded. | 476 // frontend is being loaded. |
480 // http://crbug.com/106114 | 477 // http://crbug.com/106114 |
481 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, | 478 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, |
482 TestPauseWhenLoadingDevTools) { | 479 TestPauseWhenLoadingDevTools) { |
483 RunTest("testPauseWhenLoadingDevTools", kPauseWhenLoadingDevTools); | 480 RunTest("testPauseWhenLoadingDevTools", kPauseWhenLoadingDevTools); |
484 } | 481 } |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
609 content::CONSOLE_MESSAGE_LEVEL_LOG, | 606 content::CONSOLE_MESSAGE_LEVEL_LOG, |
610 "log"); | 607 "log"); |
611 devtools_manager->AddMessageToConsole(agent_host, | 608 devtools_manager->AddMessageToConsole(agent_host, |
612 content::CONSOLE_MESSAGE_LEVEL_ERROR, | 609 content::CONSOLE_MESSAGE_LEVEL_ERROR, |
613 "error"); | 610 "error"); |
614 RunTestFunction(window_, "checkLogAndErrorMessages"); | 611 RunTestFunction(window_, "checkLogAndErrorMessages"); |
615 CloseDevToolsWindow(); | 612 CloseDevToolsWindow(); |
616 } | 613 } |
617 | 614 |
618 } // namespace | 615 } // namespace |
OLD | NEW |