| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 <queue> | 5 #include <queue> |
| 6 | 6 |
| 7 #include "base/location.h" | 7 #include "base/location.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "base/process/process.h" | 9 #include "base/process/process.h" |
| 10 #include "base/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
| (...skipping 2226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2237 | 2237 |
| 2238 IN_PROC_BROWSER_TEST_F(WebViewTest, NoPermission) { | 2238 IN_PROC_BROWSER_TEST_F(WebViewTest, NoPermission) { |
| 2239 ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/nopermission")) | 2239 ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/nopermission")) |
| 2240 << message_; | 2240 << message_; |
| 2241 } | 2241 } |
| 2242 | 2242 |
| 2243 IN_PROC_BROWSER_TEST_F(WebViewTest, Dialog_TestAlertDialog) { | 2243 IN_PROC_BROWSER_TEST_F(WebViewTest, Dialog_TestAlertDialog) { |
| 2244 TestHelper("testAlertDialog", "web_view/dialog", NO_TEST_SERVER); | 2244 TestHelper("testAlertDialog", "web_view/dialog", NO_TEST_SERVER); |
| 2245 } | 2245 } |
| 2246 | 2246 |
| 2247 #if defined(OS_MACOSX) || !defined(NDEBUG) | 2247 #if defined(OS_MACOSX) |
| 2248 // http://crbug.com/530660 for failure on Mac OS, | 2248 // http://crbug.com/530660 |
| 2249 // http://crbug.com/530593 for failure on Debug build. | |
| 2250 #define MAYBE_TestConfirmDialog\ | 2249 #define MAYBE_TestConfirmDialog\ |
| 2251 DISABLED_TestConfirmDialog | 2250 DISABLED_TestConfirmDialog |
| 2252 #else | 2251 #else |
| 2253 #define MAYBE_TestConfirmDialog\ | 2252 #define MAYBE_TestConfirmDialog\ |
| 2254 TestConfirmDialog | 2253 TestConfirmDialog |
| 2255 #endif | 2254 #endif |
| 2256 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_TestConfirmDialog) { | 2255 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_TestConfirmDialog) { |
| 2257 TestHelper("testConfirmDialog", "web_view/dialog", NO_TEST_SERVER); | 2256 TestHelper("testConfirmDialog", "web_view/dialog", NO_TEST_SERVER); |
| 2258 } | 2257 } |
| 2259 | 2258 |
| 2260 #if !defined(NDEBUG) | 2259 IN_PROC_BROWSER_TEST_F(WebViewTest, Dialog_TestConfirmDialogCancel) { |
| 2261 // Test is failing in debug: https://crbug.com/530593 | |
| 2262 #define MAYBE_Dialog_TestConfirmDialogCancel \ | |
| 2263 DISABLED_Dialog_TestConfirmDialogCancel | |
| 2264 #else | |
| 2265 #define MAYBE_Dialog_TestConfirmDialogCancel \ | |
| 2266 Dialog_TestConfirmDialogCancel | |
| 2267 #endif | |
| 2268 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_Dialog_TestConfirmDialogCancel) { | |
| 2269 TestHelper("testConfirmDialogCancel", "web_view/dialog", NO_TEST_SERVER); | 2260 TestHelper("testConfirmDialogCancel", "web_view/dialog", NO_TEST_SERVER); |
| 2270 } | 2261 } |
| 2271 | 2262 |
| 2272 #if !defined(NDEBUG) | 2263 IN_PROC_BROWSER_TEST_F(WebViewTest, Dialog_TestConfirmDialogDefaultCancel) { |
| 2273 // Test is failing in debug: https://crbug.com/530593 | |
| 2274 #define MAYBE_Dialog_TestConfirmDialogDefaultCancel \ | |
| 2275 DISABLED_Dialog_TestConfirmDialogDefaultCancel | |
| 2276 #else | |
| 2277 #define MAYBE_Dialog_TestConfirmDialogDefaultCancel \ | |
| 2278 Dialog_TestConfirmDialogDefaultCancel | |
| 2279 #endif | |
| 2280 IN_PROC_BROWSER_TEST_F(WebViewTest, | |
| 2281 MAYBE_Dialog_TestConfirmDialogDefaultCancel) { | |
| 2282 TestHelper("testConfirmDialogDefaultCancel", | 2264 TestHelper("testConfirmDialogDefaultCancel", |
| 2283 "web_view/dialog", | 2265 "web_view/dialog", |
| 2284 NO_TEST_SERVER); | 2266 NO_TEST_SERVER); |
| 2285 } | 2267 } |
| 2286 | 2268 |
| 2287 #if !defined(NDEBUG) | 2269 IN_PROC_BROWSER_TEST_F(WebViewTest, Dialog_TestConfirmDialogDefaultGCCancel) { |
| 2288 // Test is failing in debug: https://crbug.com/530593 | |
| 2289 #define MAYBE_Dialog_TestConfirmDialogDefaultGCCancel \ | |
| 2290 DISABLED_Dialog_TestConfirmDialogDefaultGCCancel | |
| 2291 #else | |
| 2292 #define MAYBE_Dialog_TestConfirmDialogDefaultGCCancel \ | |
| 2293 Dialog_TestConfirmDialogDefaultGCCancel | |
| 2294 #endif | |
| 2295 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_Dialog_TestConfirmDialogDefaultGCCance
l) { | |
| 2296 TestHelper("testConfirmDialogDefaultGCCancel", | 2270 TestHelper("testConfirmDialogDefaultGCCancel", |
| 2297 "web_view/dialog", | 2271 "web_view/dialog", |
| 2298 NO_TEST_SERVER); | 2272 NO_TEST_SERVER); |
| 2299 } | 2273 } |
| 2300 | 2274 |
| 2301 #if !defined(NDEBUG) | 2275 IN_PROC_BROWSER_TEST_F(WebViewTest, Dialog_TestPromptDialog) { |
| 2302 // Test is failing in debug: https://crbug.com/530593 | |
| 2303 #define MAYBE_Dialog_TestPromptDialog \ | |
| 2304 DISABLED_Dialog_TestPromptDialog | |
| 2305 #else | |
| 2306 #define MAYBE_Dialog_TestPromptDialog \ | |
| 2307 Dialog_TestPromptDialog | |
| 2308 #endif | |
| 2309 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_Dialog_TestPromptDialog) { | |
| 2310 TestHelper("testPromptDialog", "web_view/dialog", NO_TEST_SERVER); | 2276 TestHelper("testPromptDialog", "web_view/dialog", NO_TEST_SERVER); |
| 2311 } | 2277 } |
| 2312 | 2278 |
| 2313 IN_PROC_BROWSER_TEST_F(WebViewTest, NoContentSettingsAPI) { | 2279 IN_PROC_BROWSER_TEST_F(WebViewTest, NoContentSettingsAPI) { |
| 2314 // Load the extension. | 2280 // Load the extension. |
| 2315 const extensions::Extension* content_settings_extension = | 2281 const extensions::Extension* content_settings_extension = |
| 2316 LoadExtension( | 2282 LoadExtension( |
| 2317 test_data_dir_.AppendASCII( | 2283 test_data_dir_.AppendASCII( |
| 2318 "platform_apps/web_view/extension_api/content_settings")); | 2284 "platform_apps/web_view/extension_api/content_settings")); |
| 2319 ASSERT_TRUE(content_settings_extension); | 2285 ASSERT_TRUE(content_settings_extension); |
| (...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2797 const task_management::Task* task = task_manager.tasks().back(); | 2763 const task_management::Task* task = task_manager.tasks().back(); |
| 2798 EXPECT_EQ(task_management::Task::GUEST, task->GetType()); | 2764 EXPECT_EQ(task_management::Task::GUEST, task->GetType()); |
| 2799 const base::string16 title = task->title(); | 2765 const base::string16 title = task->title(); |
| 2800 const base::string16 expected_prefix = GetExpectedPrefix(guest_contents); | 2766 const base::string16 expected_prefix = GetExpectedPrefix(guest_contents); |
| 2801 EXPECT_TRUE(base::StartsWith(title, | 2767 EXPECT_TRUE(base::StartsWith(title, |
| 2802 expected_prefix, | 2768 expected_prefix, |
| 2803 base::CompareCase::INSENSITIVE_ASCII)); | 2769 base::CompareCase::INSENSITIVE_ASCII)); |
| 2804 } | 2770 } |
| 2805 | 2771 |
| 2806 #endif // defined(ENABLE_TASK_MANAGER) | 2772 #endif // defined(ENABLE_TASK_MANAGER) |
| OLD | NEW |