Make EarlGrey matchers compliant with Chromium style.

ios/chrome/browser/web/http_auth_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/memory/ptr_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/strings/grit/components_strings.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "ios/chrome/test/app/navigation_test_util.h"
 #import "ios/chrome/test/earl_grey/chrome_matchers.h"
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
 #import "ios/testing/wait_util.h"
 #import "ios/web/public/test/http_server.h"
 #include "ios/web/public/test/http_server_util.h"
 #import "ios/web/public/test/response_providers/http_auth_response_provider.h"
 #import "ios/testing/earl_grey/disabled_test_macros.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "url/gurl.h"
 
 using testing::WaitUntilConditionOrTimeout;
 using testing::kWaitForPageLoadTimeout;
-using chrome_test_util::webViewContainingText;
+using chrome_test_util::WebViewContainingText;
 
 namespace {
 
 // Returns matcher for HTTP Authentication dialog.
-id<GREYMatcher> httpAuthDialog() {
+id<GREYMatcher> HttpAuthDialog() {
   NSString* title = l10n_util::GetNSStringWithFixup(IDS_LOGIN_DIALOG_TITLE);
-  return chrome_test_util::staticTextWithAccessibilityLabel(title);
+  return chrome_test_util::StaticTextWithAccessibilityLabel(title);
 }
 
 // Returns matcher for Username text field.
-id<GREYMatcher> usernameField() {
-  return chrome_test_util::staticTextWithAccessibilityLabelId(
+id<GREYMatcher> UsernameField() {
+  return chrome_test_util::StaticTextWithAccessibilityLabelId(
       IDS_IOS_HTTP_LOGIN_DIALOG_USERNAME_PLACEHOLDER);
 }
 
 // Returns matcher for Password text field.
-id<GREYMatcher> passwordField() {
-  return chrome_test_util::staticTextWithAccessibilityLabelId(
+id<GREYMatcher> PasswordField() {
+  return chrome_test_util::StaticTextWithAccessibilityLabelId(
       IDS_IOS_HTTP_LOGIN_DIALOG_PASSWORD_PLACEHOLDER);
 }
 
 // Returns matcher for Login button.
-id<GREYMatcher> loginButton() {
-  return chrome_test_util::buttonWithAccessibilityLabelId(
+id<GREYMatcher> LoginButton() {
+  return chrome_test_util::ButtonWithAccessibilityLabelId(
       IDS_LOGIN_DIALOG_OK_BUTTON_LABEL);
 }
 
 // Waits until static text with IDS_LOGIN_DIALOG_TITLE label is displayed.
 void WaitForHttpAuthDialog() {
   BOOL dialog_shown = WaitUntilConditionOrTimeout(kWaitForPageLoadTimeout, ^{
     NSError* error = nil;
-    [[EarlGrey selectElementWithMatcher:httpAuthDialog()]
+    [[EarlGrey selectElementWithMatcher:HttpAuthDialog()]
         assertWithMatcher:grey_notNil()
                     error:&error];
     return !error;
   });
   GREYAssert(dialog_shown, @"HTTP Authentication dialog was not shown");
 }
 
 }  // namespace
 
 // Test case for HTTP Authentication flow.
@@ skipping 11 matching lines @@
     EARL_GREY_TEST_DISABLED(@"Tab Title not displayed on handset.");
   }
 
   GURL URL = web::test::HttpServer::MakeUrl("http://good-auth");
   web::test::SetUpHttpServer(base::MakeUnique<web::HttpAuthResponseProvider>(
       URL, "GoodRealm", "gooduser", "goodpass"));
   chrome_test_util::LoadUrl(URL);
   WaitForHttpAuthDialog();
 
   // Enter valid username and password.
-  [[EarlGrey selectElementWithMatcher:usernameField()]
+  [[EarlGrey selectElementWithMatcher:UsernameField()]
       performAction:grey_typeText(@"gooduser")];
-  [[EarlGrey selectElementWithMatcher:passwordField()]
+  [[EarlGrey selectElementWithMatcher:PasswordField()]
       performAction:grey_typeText(@"goodpass")];
-  [[EarlGrey selectElementWithMatcher:loginButton()] performAction:grey_tap()];
+  [[EarlGrey selectElementWithMatcher:LoginButton()] performAction:grey_tap()];
 
   const std::string pageText = web::HttpAuthResponseProvider::page_text();
-  [[EarlGrey selectElementWithMatcher:webViewContainingText(pageText)]
+  [[EarlGrey selectElementWithMatcher:WebViewContainingText(pageText)]
       assertWithMatcher:grey_notNil()];
 }
 
 // Tests Basic HTTP Authentication with incorrect username and password.
 - (void)testUnsuccessfullBasicAuth {
   if (IsIPadIdiom()) {
     // EG does not allow interactions with HTTP Dialog when loading spinner is
     // animated. TODO(crbug.com/680290): Enable this test on iPad when EarlGrey
     // allows tapping dialog buttons with active page load spinner.
     EARL_GREY_TEST_DISABLED(@"Tab Title not displayed on handset.");
   }
 
   GURL URL = web::test::HttpServer::MakeUrl("http://bad-auth");
   web::test::SetUpHttpServer(base::MakeUnique<web::HttpAuthResponseProvider>(
       URL, "BadRealm", "baduser", "badpass"));
   chrome_test_util::LoadUrl(URL);
   WaitForHttpAuthDialog();
 
   // Enter invalid username and password.
-  [[EarlGrey selectElementWithMatcher:usernameField()]
+  [[EarlGrey selectElementWithMatcher:UsernameField()]
       performAction:grey_typeText(@"gooduser")];
-  [[EarlGrey selectElementWithMatcher:passwordField()]
+  [[EarlGrey selectElementWithMatcher:PasswordField()]
       performAction:grey_typeText(@"goodpass")];
-  [[EarlGrey selectElementWithMatcher:loginButton()] performAction:grey_tap()];
+  [[EarlGrey selectElementWithMatcher:LoginButton()] performAction:grey_tap()];
 
   // Verifies that authentication was requested again.
   WaitForHttpAuthDialog();
 }
 
 // Tests Cancelling Basic HTTP Authentication.
 - (void)testCancellingBasicAuth {
   if (IsIPadIdiom()) {
     // EG does not allow interactions with HTTP Dialog when loading spinner is
     // animated. TODO(crbug.com/680290): Enable this test on iPad when EarlGrey
     // allows tapping dialog buttons with active page load spinner.
     EARL_GREY_TEST_DISABLED(@"Tab Title not displayed on handset.");
   }
 
   GURL URL = web::test::HttpServer::MakeUrl("http://cancel-auth");
   web::test::SetUpHttpServer(base::MakeUnique<web::HttpAuthResponseProvider>(
       URL, "CancellingRealm", "", ""));
   chrome_test_util::LoadUrl(URL);
   WaitForHttpAuthDialog();
 
-  [[EarlGrey selectElementWithMatcher:chrome_test_util::cancelButton()]
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::CancelButton()]
       performAction:grey_tap()];
-  [[EarlGrey selectElementWithMatcher:httpAuthDialog()]
+  [[EarlGrey selectElementWithMatcher:HttpAuthDialog()]
       assertWithMatcher:grey_nil()];
 }
 
 @end