| 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 772 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 783 #if defined(OS_WIN) | 783 #if defined(OS_WIN) |
| 784 // Flaking on windows swarm try runs: crbug.com/409285. | 784 // Flaking on windows swarm try runs: crbug.com/409285. |
| 785 #define MAYBE_TestConsoleOnNavigateBack DISABLED_TestConsoleOnNavigateBack | 785 #define MAYBE_TestConsoleOnNavigateBack DISABLED_TestConsoleOnNavigateBack |
| 786 #else | 786 #else |
| 787 #define MAYBE_TestConsoleOnNavigateBack TestConsoleOnNavigateBack | 787 #define MAYBE_TestConsoleOnNavigateBack TestConsoleOnNavigateBack |
| 788 #endif | 788 #endif |
| 789 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestConsoleOnNavigateBack) { | 789 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestConsoleOnNavigateBack) { |
| 790 RunTest("testConsoleOnNavigateBack", kNavigateBackTestPage); | 790 RunTest("testConsoleOnNavigateBack", kNavigateBackTestPage); |
| 791 } | 791 } |
| 792 | 792 |
| 793 // https://crbug.com/397889 | 793 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestDeviceEmulation) { |
| 794 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestDeviceEmulation) { | |
| 795 RunTest("testDeviceMetricsOverrides", "about:blank"); | 794 RunTest("testDeviceMetricsOverrides", "about:blank"); |
| 796 } | 795 } |
| 797 | 796 |
| 798 | 797 |
| 799 // Tests that external navigation from inspector page is always handled by | 798 // Tests that external navigation from inspector page is always handled by |
| 800 // DevToolsWindow and results in inspected page navigation. | 799 // DevToolsWindow and results in inspected page navigation. |
| 801 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestDevToolsExternalNavigation) { | 800 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestDevToolsExternalNavigation) { |
| 802 OpenDevToolsWindow(kDebuggerTestPage, true); | 801 OpenDevToolsWindow(kDebuggerTestPage, true); |
| 803 GURL url = test_server()->GetURL(kNavigateBackTestPage); | 802 GURL url = test_server()->GetURL(kNavigateBackTestPage); |
| 804 ui_test_utils::UrlLoadObserver observer(url, | 803 ui_test_utils::UrlLoadObserver observer(url, |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 916 | 915 |
| 917 IN_PROC_BROWSER_TEST_F(RemoteDebuggingTest, RemoteDebugger) { | 916 IN_PROC_BROWSER_TEST_F(RemoteDebuggingTest, RemoteDebugger) { |
| 918 #if defined(OS_WIN) && defined(USE_ASH) | 917 #if defined(OS_WIN) && defined(USE_ASH) |
| 919 // Disable this test in Metro+Ash for now (http://crbug.com/262796). | 918 // Disable this test in Metro+Ash for now (http://crbug.com/262796). |
| 920 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) | 919 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) |
| 921 return; | 920 return; |
| 922 #endif | 921 #endif |
| 923 | 922 |
| 924 ASSERT_TRUE(RunExtensionTest("target_list")) << message_; | 923 ASSERT_TRUE(RunExtensionTest("target_list")) << message_; |
| 925 } | 924 } |
| OLD | NEW |