| 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 <map> | 5 #include <map> |
| 6 | 6 |
| 7 #include "base/strings/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
| 8 #import "base/test/ios/wait_util.h" | 8 #import "base/test/ios/wait_util.h" |
| 9 #import "ios/web/public/test/http_server.h" | 9 #import "ios/web/public/test/http_server/http_server.h" |
| 10 #include "ios/web/public/test/http_server_util.h" | 10 #include "ios/web/public/test/http_server/http_server_util.h" |
| 11 #import "ios/web/shell/test/earl_grey/shell_earl_grey.h" | 11 #import "ios/web/shell/test/earl_grey/shell_earl_grey.h" |
| 12 #import "ios/web/shell/test/earl_grey/shell_matchers.h" | 12 #import "ios/web/shell/test/earl_grey/shell_matchers.h" |
| 13 #import "ios/web/shell/test/earl_grey/web_shell_test_case.h" | 13 #import "ios/web/shell/test/earl_grey/web_shell_test_case.h" |
| 14 | 14 |
| 15 #if !defined(__has_feature) || !__has_feature(objc_arc) | 15 #if !defined(__has_feature) || !__has_feature(objc_arc) |
| 16 #error "This file requires ARC support." | 16 #error "This file requires ARC support." |
| 17 #endif | 17 #endif |
| 18 | 18 |
| 19 namespace { | 19 namespace { |
| 20 | 20 |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 base::TimeDelta::FromSecondsD(refreshIntervalInSeconds)); | 73 base::TimeDelta::FromSecondsD(refreshIntervalInSeconds)); |
| 74 | 74 |
| 75 // Verify that redirect happened. | 75 // Verify that redirect happened. |
| 76 [[EarlGrey selectElementWithMatcher:AddressFieldText(destinationURL.spec())] | 76 [[EarlGrey selectElementWithMatcher:AddressFieldText(destinationURL.spec())] |
| 77 assertWithMatcher:grey_notNil()]; | 77 assertWithMatcher:grey_notNil()]; |
| 78 [[EarlGrey selectElementWithMatcher:WebViewContainingText(kDestinationPage)] | 78 [[EarlGrey selectElementWithMatcher:WebViewContainingText(kDestinationPage)] |
| 79 assertWithMatcher:grey_notNil()]; | 79 assertWithMatcher:grey_notNil()]; |
| 80 } | 80 } |
| 81 | 81 |
| 82 @end | 82 @end |
| OLD | NEW |