Make EarlGrey matchers compliant with Chromium style.

ios/chrome/browser/ui/error_page_egtest.mm

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import <EarlGrey/EarlGrey.h>
 
 #include "components/strings/grit/components_strings.h"
 #include "ios/chrome/test/app/web_view_interaction_test_util.h"
 #import "ios/chrome/test/earl_grey/chrome_earl_grey.h"
 #import "ios/chrome/test/earl_grey/chrome_matchers.h"
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
 #import "ios/web/public/test/http_server.h"
 #include "ios/web/public/test/http_server_util.h"
 #include "ios/web/public/test/response_providers/data_response_provider.h"
 #include "ios/web/public/test/response_providers/error_page_response_provider.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
-using chrome_test_util::omniboxText;
-using chrome_test_util::staticHtmlViewContainingText;
+using chrome_test_util::OmniboxText;
+using chrome_test_util::StaticHtmlViewContainingText;
 using chrome_test_util::TapWebViewElementWithId;
-using chrome_test_util::webViewBelongingToWebController;
-using chrome_test_util::webViewContainingText;
+using chrome_test_util::WebViewBelongingToWebController;

[Eugene But (OOO till 7-30), 2017/01/23 19:39:03]

Please use WebViewInWebState instead.

[baxley, 2017/01/24 22:18:49]

Done.

+using chrome_test_util::WebViewContainingText;
 
 using web::test::HttpServer;
 
 // Tests display of error pages for bad URLs.
 @interface ErrorPageTestCase : ChromeTestCase
 
 // Checks that the DNS error page is visible.
 - (void)checkErrorPageIsVisible;
 
 // Checks that the DNS error page is not visible.
 - (void)checkErrorPageIsNotVisible;
 
 @end
 
 @implementation ErrorPageTestCase
 
 #pragma mark - utilities
 
 // TODO(crbug.com/638674): Evaluate if this can move to shared code.
 - (void)checkErrorPageIsVisible {
   // The DNS error page is static HTML content, so it isn't part of the webview
   // owned by the webstate.
-  [[EarlGrey selectElementWithMatcher:webViewBelongingToWebController()]
+  [[EarlGrey selectElementWithMatcher:WebViewBelongingToWebController()]
       assertWithMatcher:grey_nil()];
   NSString* const kError =
       l10n_util::GetNSString(IDS_ERRORPAGES_HEADING_NOT_AVAILABLE);
-  [[EarlGrey selectElementWithMatcher:staticHtmlViewContainingText(kError)]
+  [[EarlGrey selectElementWithMatcher:StaticHtmlViewContainingText(kError)]
       assertWithMatcher:grey_notNil()];
 }
 
 - (void)checkErrorPageIsNotVisible {
   // Check that the webview belongs to the web controller, and that the error
   // text doesn't appear in the webview.
-  [[EarlGrey selectElementWithMatcher:webViewBelongingToWebController()]
+  [[EarlGrey selectElementWithMatcher:WebViewBelongingToWebController()]
       assertWithMatcher:grey_notNil()];
   const std::string kError =
       l10n_util::GetStringUTF8(IDS_ERRORPAGES_HEADING_NOT_AVAILABLE);
-  [[EarlGrey selectElementWithMatcher:webViewContainingText(kError)]
+  [[EarlGrey selectElementWithMatcher:WebViewContainingText(kError)]
       assertWithMatcher:grey_nil()];
 }
 
 #pragma mark - tests
 
 // Tests whether the error page is displayed for a bad URL.
 - (void)testErrorPage {
   std::unique_ptr<web::DataResponseProvider> provider(
       new ErrorPageResponseProvider());
   web::test::SetUpHttpServer(std::move(provider));
 
   [ChromeEarlGrey loadURL:ErrorPageResponseProvider::GetDnsFailureUrl()];
 
   [self checkErrorPageIsVisible];
 }
 
 // Tests whether the error page is displayed if it is behind a redirect.
 - (void)testErrorPageRedirect {
   std::unique_ptr<web::DataResponseProvider> provider(
       new ErrorPageResponseProvider());
   web::test::SetUpHttpServer(std::move(provider));
 
   // Load a URL that redirects to the DNS-failing URL.
   [ChromeEarlGrey
       loadURL:ErrorPageResponseProvider::GetRedirectToDnsFailureUrl()];
 
   // Verify that the redirect occurred before checking for the DNS error.
   const std::string& redirectedURL =
       ErrorPageResponseProvider::GetDnsFailureUrl().GetContent();
-  [[EarlGrey selectElementWithMatcher:omniboxText(redirectedURL)]
+  [[EarlGrey selectElementWithMatcher:OmniboxText(redirectedURL)]
       assertWithMatcher:grey_notNil()];
 
   [self checkErrorPageIsVisible];
 }
 
 // Tests that the error page is not displayed if the bad URL is in a <iframe>
 // tag.
 - (void)testErrorPageInIFrame {
   std::map<GURL, std::string> responses;
   const GURL URL = HttpServer::MakeUrl("http://browsingErrorPageInIFrame");
@@ skipping 26 matching lines @@
       "<script>setTimeout(" + "function() { document.body.innerHTML+='<p>" +
       kTimerCompleted + "</p>" + "<iframe src=\"" +
       ErrorPageResponseProvider::GetDnsFailureUrl().spec() +
       "\"></iframe>'}, 1000);" + "</script>";
   std::unique_ptr<web::DataResponseProvider> provider(
       new ErrorPageResponseProvider(responses));
   web::test::SetUpHttpServer(std::move(provider));
 
   [ChromeEarlGrey loadURL:URL];
   // Check that the timer has completed.
-  [[EarlGrey selectElementWithMatcher:webViewContainingText(kTimerCompleted)]
+  [[EarlGrey selectElementWithMatcher:WebViewContainingText(kTimerCompleted)]
       assertWithMatcher:grey_notNil()];
   // DNS error page should still not appear.
   [self checkErrorPageIsNotVisible];
 }
 
 // Tests that the error page is not displayed if the navigation was not
 // user-initiated.
 - (void)testErrorPageNoUserInteraction {
   // Create map of canned responses and set up the test HTML server.
   std::map<GURL, std::string> responses;
@@ skipping 16 matching lines @@
                    "</p><iframe src=" +
                    ErrorPageResponseProvider::GetDnsFailureUrl().spec() +
                    ">\"}, " + kTimeoutMs + ");'></form>";
   std::unique_ptr<web::DataResponseProvider> provider(
       new ErrorPageResponseProvider(responses));
   web::test::SetUpHttpServer(std::move(provider));
 
   [ChromeEarlGrey loadURL:URL];
   TapWebViewElementWithId(kButtonId);
   // Check that the timer has completed.
-  [[EarlGrey selectElementWithMatcher:webViewContainingText(kTimerCompleted)]
+  [[EarlGrey selectElementWithMatcher:WebViewContainingText(kTimerCompleted)]
       assertWithMatcher:grey_notNil()];
   // DNS error page should still not appear.
   [self checkErrorPageIsNotVisible];
 }
 
 @end