| 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 837 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 848 ASSERT_FALSE(toolbox_web_contents()); | 848 ASSERT_FALSE(toolbox_web_contents()); |
| 849 DevToolsWindow* on_self = | 849 DevToolsWindow* on_self = |
| 850 DevToolsWindowTesting::OpenDevToolsWindowSync(main_web_contents(), false); | 850 DevToolsWindowTesting::OpenDevToolsWindowSync(main_web_contents(), false); |
| 851 ASSERT_FALSE(DevToolsWindowTesting::Get(on_self)->toolbox_web_contents()); | 851 ASSERT_FALSE(DevToolsWindowTesting::Get(on_self)->toolbox_web_contents()); |
| 852 DevToolsWindowTesting::CloseDevToolsWindowSync(on_self); | 852 DevToolsWindowTesting::CloseDevToolsWindowSync(on_self); |
| 853 CloseDevToolsWindow(); | 853 CloseDevToolsWindow(); |
| 854 } | 854 } |
| 855 | 855 |
| 856 // Tests that inspector will reattach to inspected page when it is reloaded | 856 // Tests that inspector will reattach to inspected page when it is reloaded |
| 857 // after a crash. See http://crbug.com/101952 | 857 // after a crash. See http://crbug.com/101952 |
| 858 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestReattachAfterCrash) { | 858 // Disabled. it doesn't check anything right now: http://crbug.com/461790 |
| 859 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestReattachAfterCrash) { |
| 859 RunTest("testReattachAfterCrash", std::string()); | 860 RunTest("testReattachAfterCrash", std::string()); |
| 860 } | 861 } |
| 861 | 862 |
| 862 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestPageWithNoJavaScript) { | 863 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestPageWithNoJavaScript) { |
| 863 OpenDevToolsWindow("about:blank", false); | 864 OpenDevToolsWindow("about:blank", false); |
| 864 std::string result; | 865 std::string result; |
| 865 ASSERT_TRUE( | 866 ASSERT_TRUE( |
| 866 content::ExecuteScriptAndExtractString( | 867 content::ExecuteScriptAndExtractString( |
| 867 main_web_contents()->GetRenderViewHost(), | 868 main_web_contents()->GetRenderViewHost(), |
| 868 "window.domAutomationController.send(" | 869 "window.domAutomationController.send(" |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 945 IN_PROC_BROWSER_TEST_F(RemoteDebuggingTest, MAYBE_RemoteDebugger) { | 946 IN_PROC_BROWSER_TEST_F(RemoteDebuggingTest, MAYBE_RemoteDebugger) { |
| 946 #if defined(OS_WIN) && defined(USE_ASH) | 947 #if defined(OS_WIN) && defined(USE_ASH) |
| 947 // Disable this test in Metro+Ash for now (http://crbug.com/262796). | 948 // Disable this test in Metro+Ash for now (http://crbug.com/262796). |
| 948 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 949 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 949 switches::kAshBrowserTests)) | 950 switches::kAshBrowserTests)) |
| 950 return; | 951 return; |
| 951 #endif | 952 #endif |
| 952 | 953 |
| 953 ASSERT_TRUE(RunExtensionTest("target_list")) << message_; | 954 ASSERT_TRUE(RunExtensionTest("target_list")) << message_; |
| 954 } | 955 } |
| OLD | NEW |