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 #include <set> | 6 #include <set> |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
(...skipping 2250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2261 NEEDS_TEST_SERVER); | 2261 NEEDS_TEST_SERVER); |
2262 } | 2262 } |
2263 | 2263 |
2264 IN_PROC_BROWSER_TEST_P(WebViewTest, ClearData) { | 2264 IN_PROC_BROWSER_TEST_P(WebViewTest, ClearData) { |
2265 ASSERT_TRUE(StartEmbeddedTestServer()); // For serving guest pages. | 2265 ASSERT_TRUE(StartEmbeddedTestServer()); // For serving guest pages. |
2266 ASSERT_TRUE(RunPlatformAppTestWithArg( | 2266 ASSERT_TRUE(RunPlatformAppTestWithArg( |
2267 "platform_apps/web_view/common", "cleardata")) | 2267 "platform_apps/web_view/common", "cleardata")) |
2268 << message_; | 2268 << message_; |
2269 } | 2269 } |
2270 | 2270 |
| 2271 // Regression test for https://crbug.com/615429. |
| 2272 IN_PROC_BROWSER_TEST_P(WebViewTest, ClearDataTwice) { |
| 2273 ASSERT_TRUE(StartEmbeddedTestServer()); // For serving guest pages. |
| 2274 ASSERT_TRUE(RunPlatformAppTestWithArg("platform_apps/web_view/common", |
| 2275 "cleardata_twice")) |
| 2276 << message_; |
| 2277 } |
| 2278 |
2271 #if defined(OS_WIN) | 2279 #if defined(OS_WIN) |
2272 // Test is disabled on Windows because it fails often (~9% time) | 2280 // Test is disabled on Windows because it fails often (~9% time) |
2273 // http://crbug.com/489088 | 2281 // http://crbug.com/489088 |
2274 #define MAYBE_ClearDataCache DISABLED_ClearDataCache | 2282 #define MAYBE_ClearDataCache DISABLED_ClearDataCache |
2275 #else | 2283 #else |
2276 #define MAYBE_ClearDataCache ClearDataCache | 2284 #define MAYBE_ClearDataCache ClearDataCache |
2277 #endif | 2285 #endif |
2278 IN_PROC_BROWSER_TEST_P(WebViewTest, MAYBE_ClearDataCache) { | 2286 IN_PROC_BROWSER_TEST_P(WebViewTest, MAYBE_ClearDataCache) { |
2279 TestHelper("testClearCache", "web_view/clear_data_cache", NEEDS_TEST_SERVER); | 2287 TestHelper("testClearCache", "web_view/clear_data_cache", NEEDS_TEST_SERVER); |
2280 } | 2288 } |
(...skipping 1222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3503 gfx::Point embedder_origin = | 3511 gfx::Point embedder_origin = |
3504 GetEmbedderWebContents()->GetContainerBounds().origin(); | 3512 GetEmbedderWebContents()->GetContainerBounds().origin(); |
3505 guest_rect.Offset(-embedder_origin.x(), -embedder_origin.y()); | 3513 guest_rect.Offset(-embedder_origin.x(), -embedder_origin.y()); |
3506 | 3514 |
3507 // Generate and send synthetic touch event. | 3515 // Generate and send synthetic touch event. |
3508 content::SimulateTouchPressAt(GetEmbedderWebContents(), | 3516 content::SimulateTouchPressAt(GetEmbedderWebContents(), |
3509 guest_rect.CenterPoint()); | 3517 guest_rect.CenterPoint()); |
3510 EXPECT_TRUE(aura_webview->HasFocus()); | 3518 EXPECT_TRUE(aura_webview->HasFocus()); |
3511 } | 3519 } |
3512 #endif | 3520 #endif |
OLD | NEW |