| Index: ios/chrome/browser/web/progress_indicator_egtest.mm
|
| diff --git a/ios/chrome/browser/web/progress_indicator_egtest.mm b/ios/chrome/browser/web/progress_indicator_egtest.mm
|
| index dbf4a957209c7b7a1821d0f2e5ef021166e20d40..cc2130e1ae30a2de27e3ae9d40c6f0c864f2b666 100644
|
| --- a/ios/chrome/browser/web/progress_indicator_egtest.mm
|
| +++ b/ios/chrome/browser/web/progress_indicator_egtest.mm
|
| @@ -22,7 +22,7 @@
|
| #include "ios/web/public/test/response_providers/html_response_provider.h"
|
| #include "url/gurl.h"
|
|
|
| -using chrome_test_util::webViewContainingText;
|
| +using chrome_test_util::WebViewContainingText;
|
|
|
| namespace {
|
|
|
| @@ -45,12 +45,12 @@ const char kInfinitePendingPageURL[] = "http://infinite";
|
| const char kSimplePageURL[] = "http://simplepage";
|
|
|
| // Matcher for progress view.
|
| -id<GREYMatcher> progressView() {
|
| +id<GREYMatcher> ProgressView() {
|
| return grey_kindOfClass([MDCProgressView class]);
|
| }
|
|
|
| // Matcher for the progress view with |progress|.
|
| -id<GREYMatcher> progressViewWithProgress(CGFloat progress) {
|
| +id<GREYMatcher> ProgressViewWithProgress(CGFloat progress) {
|
| MatchesBlock matches = ^BOOL(UIView* view) {
|
| MDCProgressView* progressView = base::mac::ObjCCast<MDCProgressView>(view);
|
| return progressView && progressView.progress == progress;
|
| @@ -150,11 +150,11 @@ class InfinitePendingResponseProvider : public HtmlResponseProvider {
|
| chrome_test_util::LoadUrl(infinitePendingURL);
|
|
|
| // Wait until the page is half loaded.
|
| - [[EarlGrey selectElementWithMatcher:webViewContainingText(kPageText)]
|
| + [[EarlGrey selectElementWithMatcher:WebViewContainingText(kPageText)]
|
| assertWithMatcher:grey_notNil()];
|
|
|
| // Verify progress view visible and halfway progress.
|
| - [[EarlGrey selectElementWithMatcher:progressViewWithProgress(0.5)]
|
| + [[EarlGrey selectElementWithMatcher:ProgressViewWithProgress(0.5)]
|
| assertWithMatcher:grey_sufficientlyVisible()];
|
|
|
| // Verify toolbar visible.
|
| @@ -184,17 +184,17 @@ class InfinitePendingResponseProvider : public HtmlResponseProvider {
|
| // Load form first.
|
| [ChromeEarlGrey loadURL:formURL];
|
|
|
| - [[EarlGrey selectElementWithMatcher:webViewContainingText(kFormPageText)]
|
| + [[EarlGrey selectElementWithMatcher:WebViewContainingText(kFormPageText)]
|
| assertWithMatcher:grey_notNil()];
|
|
|
| chrome_test_util::SubmitWebViewFormWithId(kFormID);
|
|
|
| // Wait until the page is half loaded.
|
| - [[EarlGrey selectElementWithMatcher:webViewContainingText(kPageText)]
|
| + [[EarlGrey selectElementWithMatcher:WebViewContainingText(kPageText)]
|
| assertWithMatcher:grey_notNil()];
|
|
|
| // Verify progress view visible and halfway progress.
|
| - [[EarlGrey selectElementWithMatcher:progressViewWithProgress(0.5)]
|
| + [[EarlGrey selectElementWithMatcher:ProgressViewWithProgress(0.5)]
|
| assertWithMatcher:grey_sufficientlyVisible()];
|
|
|
| // Verify toolbar visible.
|
| @@ -218,17 +218,17 @@ class InfinitePendingResponseProvider : public HtmlResponseProvider {
|
|
|
| [ChromeEarlGrey loadURL:formURL];
|
|
|
| - [[EarlGrey selectElementWithMatcher:webViewContainingText(kFormPageText)]
|
| + [[EarlGrey selectElementWithMatcher:WebViewContainingText(kFormPageText)]
|
| assertWithMatcher:grey_notNil()];
|
|
|
| chrome_test_util::SubmitWebViewFormWithId(kFormID);
|
|
|
| // Verify the new page has been loaded.
|
| - [[EarlGrey selectElementWithMatcher:webViewContainingText(kPageText)]
|
| + [[EarlGrey selectElementWithMatcher:WebViewContainingText(kPageText)]
|
| assertWithMatcher:grey_notNil()];
|
|
|
| // Verify progress view is not visible.
|
| - [[EarlGrey selectElementWithMatcher:progressView()]
|
| + [[EarlGrey selectElementWithMatcher:ProgressView()]
|
| assertWithMatcher:grey_notVisible()];
|
| }
|
|
|
| @@ -248,7 +248,7 @@ class InfinitePendingResponseProvider : public HtmlResponseProvider {
|
| [ChromeEarlGrey loadURL:formURL];
|
|
|
| // Verify the form page has been loaded.
|
| - [[EarlGrey selectElementWithMatcher:webViewContainingText(kFormPageText)]
|
| + [[EarlGrey selectElementWithMatcher:WebViewContainingText(kFormPageText)]
|
| assertWithMatcher:grey_notNil()];
|
|
|
| chrome_test_util::SubmitWebViewFormWithId(kFormID);
|
|
|