| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/files/file_path.h" | 5 #include "base/files/file_path.h" |
| 6 #include "base/location.h" | 6 #include "base/location.h" |
| 7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
| 8 #include "base/single_thread_task_runner.h" | 8 #include "base/single_thread_task_runner.h" |
| 9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
| 10 #include "base/threading/thread_task_runner_handle.h" | 10 #include "base/threading/thread_task_runner_handle.h" |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 } | 147 } |
| 148 | 148 |
| 149 IN_PROC_BROWSER_TEST_F(AutomationApiTest, TabsAutomationHostsPermissions) { | 149 IN_PROC_BROWSER_TEST_F(AutomationApiTest, TabsAutomationHostsPermissions) { |
| 150 StartEmbeddedTestServer(); | 150 StartEmbeddedTestServer(); |
| 151 ASSERT_TRUE(RunExtensionSubtest( | 151 ASSERT_TRUE(RunExtensionSubtest( |
| 152 "automation/tests/tabs_automation_hosts", "permissions.html")) | 152 "automation/tests/tabs_automation_hosts", "permissions.html")) |
| 153 << message_; | 153 << message_; |
| 154 } | 154 } |
| 155 | 155 |
| 156 #if defined(USE_AURA) | 156 #if defined(USE_AURA) |
| 157 IN_PROC_BROWSER_TEST_F(AutomationApiTest, Desktop) { | 157 // Flaky, see http://crbug.com/637525 |
| 158 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DISABLED_Desktop) { |
| 158 ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", "desktop.html")) | 159 ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", "desktop.html")) |
| 159 << message_; | 160 << message_; |
| 160 } | 161 } |
| 161 | 162 |
| 162 // TODO(crbug.com/615908): Flaky on CrOS sanitizers. | 163 // TODO(crbug.com/615908): Flaky on CrOS sanitizers. |
| 163 #if defined(OS_CHROMEOS) | 164 #if defined(OS_CHROMEOS) |
| 164 #if defined(MEMORY_SANITIZER) || defined(ADDRESS_SANITIZER) | 165 #if defined(MEMORY_SANITIZER) || defined(ADDRESS_SANITIZER) |
| 165 #define MAYBE_DesktopInitialFocus DISABLED_DesktopInitialFocus | 166 #define MAYBE_DesktopInitialFocus DISABLED_DesktopInitialFocus |
| 166 #else | 167 #else |
| 167 #define MAYBE_DesktopInitialFocus DesktopInitialFocus | 168 #define MAYBE_DesktopInitialFocus DesktopInitialFocus |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 259 } | 260 } |
| 260 | 261 |
| 261 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DocumentSelection) { | 262 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DocumentSelection) { |
| 262 StartEmbeddedTestServer(); | 263 StartEmbeddedTestServer(); |
| 263 ASSERT_TRUE( | 264 ASSERT_TRUE( |
| 264 RunExtensionSubtest("automation/tests/tabs", "document_selection.html")) | 265 RunExtensionSubtest("automation/tests/tabs", "document_selection.html")) |
| 265 << message_; | 266 << message_; |
| 266 } | 267 } |
| 267 | 268 |
| 268 } // namespace extensions | 269 } // namespace extensions |
| OLD | NEW |