| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/base_switches.h" | 5 #include "base/base_switches.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "chrome/browser/permissions/permissions_browsertest.h" | 10 #include "chrome/browser/permissions/permissions_browsertest.h" |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 | 95 |
| 96 IN_PROC_BROWSER_TEST_F(FlashPermissionBrowserTest, | 96 IN_PROC_BROWSER_TEST_F(FlashPermissionBrowserTest, |
| 97 CommonFailsBeforeRequesting) { | 97 CommonFailsBeforeRequesting) { |
| 98 CommonFailsBeforeRequesting(); | 98 CommonFailsBeforeRequesting(); |
| 99 } | 99 } |
| 100 | 100 |
| 101 IN_PROC_BROWSER_TEST_F(FlashPermissionBrowserTest, CommonFailsIfDismissed) { | 101 IN_PROC_BROWSER_TEST_F(FlashPermissionBrowserTest, CommonFailsIfDismissed) { |
| 102 CommonFailsIfDismissed(); | 102 CommonFailsIfDismissed(); |
| 103 } | 103 } |
| 104 | 104 |
| 105 IN_PROC_BROWSER_TEST_F(FlashPermissionBrowserTest, CommonFailsIfBlocked) { | 105 // https://crbug.com/706780 |
| 106 IN_PROC_BROWSER_TEST_F(FlashPermissionBrowserTest, |
| 107 DISABLED_CommonFailsIfBlocked) { |
| 106 CommonFailsIfBlocked(); | 108 CommonFailsIfBlocked(); |
| 107 } | 109 } |
| 108 | 110 |
| 109 IN_PROC_BROWSER_TEST_F(FlashPermissionBrowserTest, CommonSucceedsIfAllowed) { | 111 IN_PROC_BROWSER_TEST_F(FlashPermissionBrowserTest, CommonSucceedsIfAllowed) { |
| 110 CommonSucceedsIfAllowed(); | 112 CommonSucceedsIfAllowed(); |
| 111 } | 113 } |
| 112 | 114 |
| 113 IN_PROC_BROWSER_TEST_F(FlashPermissionBrowserTest, SucceedsInPopupWindow) { | 115 IN_PROC_BROWSER_TEST_F(FlashPermissionBrowserTest, SucceedsInPopupWindow) { |
| 114 // Spawn the same page in a popup window and wait for it to finish loading. | 116 // Spawn the same page in a popup window and wait for it to finish loading. |
| 115 content::WebContents* original_contents = GetWebContents(); | 117 content::WebContents* original_contents = GetWebContents(); |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 browser(), GURL("file://" + test_path.AsUTF8Unsafe() + test_url())); | 214 browser(), GURL("file://" + test_path.AsUTF8Unsafe() + test_url())); |
| 213 CommonFailsIfBlocked(); | 215 CommonFailsIfBlocked(); |
| 214 EXPECT_EQ(1, prompt_factory()->total_request_count()); | 216 EXPECT_EQ(1, prompt_factory()->total_request_count()); |
| 215 | 217 |
| 216 // Navigate to a second URL to verify it's blocked on all file: URLs. | 218 // Navigate to a second URL to verify it's blocked on all file: URLs. |
| 217 ui_test_utils::NavigateToURL( | 219 ui_test_utils::NavigateToURL( |
| 218 browser(), | 220 browser(), |
| 219 GURL("file://" + test_path.AsUTF8Unsafe() + "/permissions/flash2.html")); | 221 GURL("file://" + test_path.AsUTF8Unsafe() + "/permissions/flash2.html")); |
| 220 EXPECT_FALSE(FeatureUsageSucceeds()); | 222 EXPECT_FALSE(FeatureUsageSucceeds()); |
| 221 } | 223 } |
| OLD | NEW |