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 666 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
677 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestShowScriptsTab) { | 677 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestShowScriptsTab) { |
678 RunTest("testShowScriptsTab", kDebuggerTestPage); | 678 RunTest("testShowScriptsTab", kDebuggerTestPage); |
679 } | 679 } |
680 | 680 |
681 // Tests that scripts tab is populated with inspected scripts even if it | 681 // Tests that scripts tab is populated with inspected scripts even if it |
682 // hadn't been shown by the moment inspected paged refreshed. | 682 // hadn't been shown by the moment inspected paged refreshed. |
683 // @see http://crbug.com/26312 | 683 // @see http://crbug.com/26312 |
684 IN_PROC_BROWSER_TEST_F( | 684 IN_PROC_BROWSER_TEST_F( |
685 DevToolsSanityTest, | 685 DevToolsSanityTest, |
686 TestScriptsTabIsPopulatedOnInspectedPageRefresh) { | 686 TestScriptsTabIsPopulatedOnInspectedPageRefresh) { |
687 // Clear inspector settings to ensure that Elements will be | |
688 // current panel when DevTools window is open. | |
689 content::BrowserContext* browser_context = | |
690 GetInspectedTab()->GetBrowserContext(); | |
691 Profile::FromBrowserContext(browser_context)->GetPrefs()-> | |
692 ClearPref(prefs::kWebKitInspectorSettings); | |
693 | |
694 RunTest("testScriptsTabIsPopulatedOnInspectedPageRefresh", | 687 RunTest("testScriptsTabIsPopulatedOnInspectedPageRefresh", |
695 kDebuggerTestPage); | 688 kDebuggerTestPage); |
696 } | 689 } |
697 | 690 |
698 // Tests that chrome.devtools extension is correctly exposed. | 691 // Tests that chrome.devtools extension is correctly exposed. |
699 IN_PROC_BROWSER_TEST_F(DevToolsExtensionTest, | 692 IN_PROC_BROWSER_TEST_F(DevToolsExtensionTest, |
700 TestDevToolsExtensionAPI) { | 693 TestDevToolsExtensionAPI) { |
701 LoadExtension("devtools_extension"); | 694 LoadExtension("devtools_extension"); |
702 RunTest("waitForTestResultsInConsole", std::string()); | 695 RunTest("waitForTestResultsInConsole", std::string()); |
703 } | 696 } |
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
917 | 910 |
918 IN_PROC_BROWSER_TEST_F(RemoteDebuggingTest, RemoteDebugger) { | 911 IN_PROC_BROWSER_TEST_F(RemoteDebuggingTest, RemoteDebugger) { |
919 #if defined(OS_WIN) && defined(USE_ASH) | 912 #if defined(OS_WIN) && defined(USE_ASH) |
920 // Disable this test in Metro+Ash for now (http://crbug.com/262796). | 913 // Disable this test in Metro+Ash for now (http://crbug.com/262796). |
921 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) | 914 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) |
922 return; | 915 return; |
923 #endif | 916 #endif |
924 | 917 |
925 ASSERT_TRUE(RunExtensionTest("target_list")) << message_; | 918 ASSERT_TRUE(RunExtensionTest("target_list")) << message_; |
926 } | 919 } |
OLD | NEW |