| 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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 IN_PROC_BROWSER_TEST_F(AutomationApiTest, Desktop) { |
| 158 ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", "desktop.html")) | 158 ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", "desktop.html")) |
| 159 << message_; | 159 << message_; |
| 160 } | 160 } |
| 161 | 161 |
| 162 #if defined(OS_CHROMEOS) | 162 #if defined(OS_CHROMEOS) |
| 163 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopInitialFocus) { | 163 #if defined(MEMORY_SANITIZER) |
| 164 #define MAYBE_DesktopInitialFocus DISABLED_DesktopInitialFocus |
| 165 #else |
| 166 #define MAYBE_DesktopInitialFocus DesktopInitialFocus |
| 167 #endif |
| 168 IN_PROC_BROWSER_TEST_F(AutomationApiTest, MAYBE_DesktopInitialFocus) { |
| 164 ASSERT_TRUE( | 169 ASSERT_TRUE( |
| 165 RunExtensionSubtest("automation/tests/desktop", "initial_focus.html")) | 170 RunExtensionSubtest("automation/tests/desktop", "initial_focus.html")) |
| 166 << message_; | 171 << message_; |
| 167 } | 172 } |
| 168 | 173 |
| 169 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopFocusWeb) { | 174 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopFocusWeb) { |
| 170 ASSERT_TRUE( | 175 ASSERT_TRUE( |
| 171 RunExtensionSubtest("automation/tests/desktop", "focus_web.html")) | 176 RunExtensionSubtest("automation/tests/desktop", "focus_web.html")) |
| 172 << message_; | 177 << message_; |
| 173 } | 178 } |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 253 } | 258 } |
| 254 | 259 |
| 255 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DocumentSelection) { | 260 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DocumentSelection) { |
| 256 StartEmbeddedTestServer(); | 261 StartEmbeddedTestServer(); |
| 257 ASSERT_TRUE( | 262 ASSERT_TRUE( |
| 258 RunExtensionSubtest("automation/tests/tabs", "document_selection.html")) | 263 RunExtensionSubtest("automation/tests/tabs", "document_selection.html")) |
| 259 << message_; | 264 << message_; |
| 260 } | 265 } |
| 261 | 266 |
| 262 } // namespace extensions | 267 } // namespace extensions |
| OLD | NEW |