| 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 1706 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1717 // which the test checks to ensure proper storage isolation is enforced. | 1717 // which the test checks to ensure proper storage isolation is enforced. |
| 1718 IN_PROC_BROWSER_TEST_P(WebViewTest, IndexedDBIsolation) { | 1718 IN_PROC_BROWSER_TEST_P(WebViewTest, IndexedDBIsolation) { |
| 1719 ASSERT_TRUE(StartEmbeddedTestServer()); | 1719 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 1720 ASSERT_TRUE(RunPlatformAppTest( | 1720 ASSERT_TRUE(RunPlatformAppTest( |
| 1721 "platform_apps/web_view/isolation_indexeddb")) << message_; | 1721 "platform_apps/web_view/isolation_indexeddb")) << message_; |
| 1722 } | 1722 } |
| 1723 | 1723 |
| 1724 // This test ensures that closing app window on 'loadcommit' does not crash. | 1724 // This test ensures that closing app window on 'loadcommit' does not crash. |
| 1725 // The test launches an app with guest and closes the window on loadcommit. It | 1725 // The test launches an app with guest and closes the window on loadcommit. It |
| 1726 // then launches the app window again. The process is repeated 3 times. | 1726 // then launches the app window again. The process is repeated 3 times. |
| 1727 // http://crbug.com/291278 | 1727 // https://crbug.com/291278 |
| 1728 #if defined(OS_WIN) || defined(MAC_OS_X_VERSION_10_9) | 1728 // https://crbug.com/619148 |
| 1729 #if defined(OS_WIN) || defined(MAC_OS_X_VERSION_10_9) || defined(OS_LINUX) |
| 1729 #define MAYBE_CloseOnLoadcommit DISABLED_CloseOnLoadcommit | 1730 #define MAYBE_CloseOnLoadcommit DISABLED_CloseOnLoadcommit |
| 1730 #else | 1731 #else |
| 1731 #define MAYBE_CloseOnLoadcommit CloseOnLoadcommit | 1732 #define MAYBE_CloseOnLoadcommit CloseOnLoadcommit |
| 1732 #endif | 1733 #endif |
| 1733 IN_PROC_BROWSER_TEST_P(WebViewTest, MAYBE_CloseOnLoadcommit) { | 1734 IN_PROC_BROWSER_TEST_P(WebViewTest, MAYBE_CloseOnLoadcommit) { |
| 1734 LoadAndLaunchPlatformApp("web_view/close_on_loadcommit", | 1735 LoadAndLaunchPlatformApp("web_view/close_on_loadcommit", |
| 1735 "done-close-on-loadcommit"); | 1736 "done-close-on-loadcommit"); |
| 1736 } | 1737 } |
| 1737 | 1738 |
| 1738 IN_PROC_BROWSER_TEST_P(WebViewTest, MediaAccessAPIDeny_TestDeny) { | 1739 IN_PROC_BROWSER_TEST_P(WebViewTest, MediaAccessAPIDeny_TestDeny) { |
| (...skipping 1847 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3586 gfx::Point embedder_origin = | 3587 gfx::Point embedder_origin = |
| 3587 GetEmbedderWebContents()->GetContainerBounds().origin(); | 3588 GetEmbedderWebContents()->GetContainerBounds().origin(); |
| 3588 guest_rect.Offset(-embedder_origin.x(), -embedder_origin.y()); | 3589 guest_rect.Offset(-embedder_origin.x(), -embedder_origin.y()); |
| 3589 | 3590 |
| 3590 // Generate and send synthetic touch event. | 3591 // Generate and send synthetic touch event. |
| 3591 content::SimulateTouchPressAt(GetEmbedderWebContents(), | 3592 content::SimulateTouchPressAt(GetEmbedderWebContents(), |
| 3592 guest_rect.CenterPoint()); | 3593 guest_rect.CenterPoint()); |
| 3593 EXPECT_TRUE(aura_webview->HasFocus()); | 3594 EXPECT_TRUE(aura_webview->HasFocus()); |
| 3594 } | 3595 } |
| 3595 #endif | 3596 #endif |
| OLD | NEW |