Chromium Code Reviews| Index: ios/web/web_state/ui/crw_web_controller_unittest.mm |
| diff --git a/ios/web/web_state/ui/crw_web_controller_unittest.mm b/ios/web/web_state/ui/crw_web_controller_unittest.mm |
| index 58705256cb484d8f654dec6a54adeadf88c56eaf..764761bcd010e7a6b1d7d15046502b153287cd20 100644 |
| --- a/ios/web/web_state/ui/crw_web_controller_unittest.mm |
| +++ b/ios/web/web_state/ui/crw_web_controller_unittest.mm |
| @@ -688,6 +688,12 @@ TEST_F(CRWWebControllerPageDialogOpenPolicyTest, AllowPrompt) { |
| // Tests that geolocation dialog is suppressed for DIALOG_POLICY_SUPPRESS. |
| TEST_F(CRWWebControllerPageDialogOpenPolicyTest, SuppressGeolocation) { |
| + // TODO(crbug.com/626688): The geolocation APIs require HTTPS on iOS 10. Find |
| + // a way to trigger a geolocation prompt from this test. |
| + if (base::ios::IsRunningOnIOS10OrLater()) { |
| + return; |
| + } |
| + |
| [[web_delegate_mock() expect] |
| webControllerDidSuppressDialog:web_controller()]; |
| [web_controller() setShouldSuppressDialogs:YES]; |
| @@ -757,6 +763,11 @@ TEST_F(CRWWebControllerPageScrollStateTest, |
| // TODO(iOS): Flaky on the bots. crbug/493427 |
| TEST_F(CRWWebControllerPageScrollStateTest, |
| FLAKY_SetPageDisplayStateWithUserScalableEnabled) { |
| + // TODO(crbug.com/626688): Figure out why this test is hanging on iOS 10. |
|
Eugene But (OOO till 7-30)
2016/07/08 21:14:35
This should not be necessary after this landed: ht
rohitrao (ping after 24h)
2016/07/08 22:53:31
Done.
|
| + if (base::ios::IsRunningOnIOS10OrLater()) { |
| + return; |
| + } |
| + |
| web::PageZoomState zoom_state(1.0, 10.0, 1.0); |
| LoadHtml(GetHTMLForZoomState(zoom_state, PAGE_SCALABILITY_ENABLED)); |
| WaitForZoomRendering(web_controller(), zoom_state); |