Make EarlGrey matchers compliant with Chromium style.

ios/chrome/browser/web/progress_indicator_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 "base/mac/foundation_util.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #include "ios/chrome/test/app/navigation_test_util.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"
 #include "ios/chrome/test/earl_grey/chrome_util.h"
 #import "ios/testing/earl_grey/disabled_test_macros.h"
 #import "ios/third_party/material_components_ios/src/components/ProgressView/src/MaterialProgressView.h"
 #import "ios/web/public/test/http_server.h"
 #import "ios/web/public/test/http_server_util.h"
 #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 {
 
 // Text to display in form page.
 const char kFormPageText[] = "Form testing page";
 
 // Text to display in infinite loading page.
 const char kPageText[] = "Navigation testing page";
 
 // Identifier of form to submit on form page.
 const char kFormID[] = "testform";
 
 // URL string for a form page.
 const char kFormURL[] = "http://form";
 
 // URL string for an infinite pending page.
 const char kInfinitePendingPageURL[] = "http://infinite";
 
 // URL string for a simple page containing |kPageText|.
 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;
   };
 
   DescribeToBlock describe = ^(id<GREYDescription> description) {
     [description
         appendText:[NSString stringWithFormat:@"progress view with progress:%f",
                                               progress]];
   };
@@ skipping 79 matching lines @@
   const GURL infinitePendingURL =
       web::test::HttpServer::MakeUrl(kInfinitePendingPageURL);
   web::test::SetUpHttpServer(
       base::MakeUnique<InfinitePendingResponseProvider>(infinitePendingURL));
 
   // The page being loaded never completes, so call the LoadUrl helper that
   // does not wait for the page to complete loading.
   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.
   chrome_test_util::AssertToolbarVisible();
 }
 
 // Tests that the progress indicator is shown and has expected progress value
 // after a form is submitted, and the toolbar is visible.
 - (void)testProgressIndicatorShownOnFormSubmit {
   if (IsIPadIdiom()) {
     EARL_GREY_TEST_SKIPPED(@"Skipped for iPad (no progress view in tablet)");
   }
 
   const GURL formURL = web::test::HttpServer::MakeUrl(kFormURL);
   const GURL infinitePendingURL =
       web::test::HttpServer::MakeUrl(kInfinitePendingPageURL);
 
   // Create a page with a form to test.
   std::map<GURL, std::string> responses;
   responses[formURL] = [self formPageHTMLWithFormSubmitURL:infinitePendingURL];
   web::test::SetUpSimpleHttpServer(responses);
 
   // Add responseProvider for page that never finishes loading.
   web::test::AddResponseProvider(
       base::MakeUnique<InfinitePendingResponseProvider>(infinitePendingURL));
 
   // 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.
   chrome_test_util::AssertToolbarVisible();
 }
 
 // Tests that the progress indicator disappears after form has been submitted.
 - (void)testProgressIndicatorDisappearsAfterFormSubmit {
   if (IsIPadIdiom()) {
     EARL_GREY_TEST_SKIPPED(@"Skipped for iPad (no progress view in tablet)");
   }
 
   const GURL formURL = web::test::HttpServer::MakeUrl(kFormURL);
   const GURL simplePageURL = web::test::HttpServer::MakeUrl(kSimplePageURL);
 
   // Create a page with a form to test.
   std::map<GURL, std::string> responses;
   responses[formURL] = [self formPageHTMLWithFormSubmitURL:simplePageURL];
   responses[simplePageURL] = kPageText;
   web::test::SetUpSimpleHttpServer(responses);
 
   [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()];
 }
 
 // Tests that the progress indicator disappears after form post attempt with a
 // submit event that returns false.
 - (void)testProgressIndicatorDisappearsAfterSuppressedFormPost {
   if (IsIPadIdiom()) {
     EARL_GREY_TEST_SKIPPED(@"Skipped for iPad (no progress view in tablet)");
   }
 
   // Create a page with a form to test.
   const GURL formURL = web::test::HttpServer::MakeUrl(kFormURL);
   std::map<GURL, std::string> responses;
   responses[formURL] = [self formPageHTMLWithSuppressedSubmitEvent];
   web::test::SetUpSimpleHttpServer(responses);
 
   [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);
 
   // Verify progress view is not visible.
   [[EarlGrey selectElementWithMatcher:grey_kindOfClass([MDCProgressView class])]
       assertWithMatcher:grey_notVisible()];
 }
 
 @end