Make EarlGrey matchers compliant with Chromium style.

ios/chrome/browser/ui/qr_scanner/qr_scanner_view_controller_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 <AVFoundation/AVFoundation.h>
 #import <EarlGrey/EarlGrey.h>
 #import <UIKit/UIKit.h>
 
 #import "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 40 matching lines @@
 char kTestQueryEditedResponse[] = "Test query edited page";
 
 // The GREYCondition timeout used for calls to waitWithTimeout:pollInterval:.
 CFTimeInterval kGREYConditionTimeout = 5;
 // The GREYCondition poll interval used for calls to
 // waitWithTimeout:pollInterval:.
 CFTimeInterval kGREYConditionPollInterval = 0.1;
 
 // Returns the GREYMatcher for an element which is visible, interactable, and
 // enabled.
-id<GREYMatcher> visibleInteractableEnabled() {
+id<GREYMatcher> VisibleInteractableEnabled() {
   return grey_allOf(grey_sufficientlyVisible(), grey_interactable(),
                     grey_enabled(), nil);
 }
 
 // Returns the GREYMatcher for the button that closes the QR Scanner.
-id<GREYMatcher> qrScannerCloseButton() {
-  return buttonWithAccessibilityLabel(
+id<GREYMatcher> QrScannerCloseButton() {
+  return ButtonWithAccessibilityLabel(
       [[ChromeIcon closeIcon] accessibilityLabel]);
 }
 
 // Returns the GREYMatcher for the button which indicates that torch is off and
 // which turns on the torch.
-id<GREYMatcher> qrScannerTorchOffButton() {
+id<GREYMatcher> QrScannerTorchOffButton() {
   return grey_allOf(grey_accessibilityLabel(l10n_util::GetNSString(
                         IDS_IOS_QR_SCANNER_TORCH_BUTTON_ACCESSIBILITY_LABEL)),
                     grey_accessibilityValue(l10n_util::GetNSString(
                         IDS_IOS_QR_SCANNER_TORCH_OFF_ACCESSIBILITY_VALUE)),
                     grey_accessibilityTrait(UIAccessibilityTraitButton), nil);
 }
 
 // Returns the GREYMatcher for the button which indicates that torch is on and
 // which turns off the torch.
-id<GREYMatcher> qrScannerTorchOnButton() {
+id<GREYMatcher> QrScannerTorchOnButton() {
   return grey_allOf(grey_accessibilityLabel(l10n_util::GetNSString(
                         IDS_IOS_QR_SCANNER_TORCH_BUTTON_ACCESSIBILITY_LABEL)),
                     grey_accessibilityValue(l10n_util::GetNSString(
                         IDS_IOS_QR_SCANNER_TORCH_ON_ACCESSIBILITY_VALUE)),
                     grey_accessibilityTrait(UIAccessibilityTraitButton), nil);
 }
 
 // Returns the GREYMatcher for the QR Scanner viewport caption.
-id<GREYMatcher> qrScannerViewportCaption() {
-  return staticTextWithAccessibilityLabelId(
+id<GREYMatcher> QrScannerViewportCaption() {
+  return StaticTextWithAccessibilityLabelId(
       IDS_IOS_QR_SCANNER_VIEWPORT_CAPTION);
 }
 
 // Returns the GREYMatcher for the back button in the web toolbar.
-id<GREYMatcher> webToolbarBackButton() {
-  return buttonWithAccessibilityLabelId(IDS_ACCNAME_BACK);
+id<GREYMatcher> WebToolbarBackButton() {
+  return ButtonWithAccessibilityLabelId(IDS_ACCNAME_BACK);
 }
 
 // Returns the GREYMatcher for the Cancel button to dismiss a UIAlertController.
-id<GREYMatcher> dialogCancelButton() {
+id<GREYMatcher> DialogCancelButton() {
   return grey_allOf(
       grey_text(l10n_util::GetNSString(IDS_IOS_QR_SCANNER_ALERT_CANCEL)),
       grey_accessibilityTrait(UIAccessibilityTraitStaticText), nil);
 }
 
 // Opens the QR Scanner view using a command.
 // TODO(crbug.com/629776): Replace the command call with a UI action.
-void showQRScannerWithCommand() {
+void ShowQRScannerWithCommand() {
   base::scoped_nsobject<GenericChromeCommand> command(
       [[GenericChromeCommand alloc] initWithTag:IDC_SHOW_QR_SCANNER]);
   chrome_test_util::RunCommandWithActiveViewController(command);
 }
 
 // Taps the |button|.
-void tapButton(id<GREYMatcher> button) {
+void TapButton(id<GREYMatcher> button) {

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

Do you want to file a bug to get rid of these methods? Other tests do not use
this pattern.

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

Thanks for noticing. Filed crbug.com/684099

   [[EarlGrey selectElementWithMatcher:button] performAction:grey_tap()];
 }
 
 // Appends the given |editText| to the |text| already in the omnibox and presses
 // the keyboard return key.
-void editOmniboxTextAndTapKeyboardReturn(std::string text, NSString* editText) {
-  [[EarlGrey selectElementWithMatcher:omniboxText(text)]
+void EditOmniboxTextAndTapKeyboardReturn(std::string text, NSString* editText) {
+  [[EarlGrey selectElementWithMatcher:OmniboxText(text)]
       performAction:grey_typeText([editText stringByAppendingString:@"\n"])];
 }
 
 // Presses the keyboard return key.
-void tapKeyboardReturnKeyInOmniboxWithText(std::string text) {
-  [[EarlGrey selectElementWithMatcher:omniboxText(text)]
+void TapKeyboardReturnKeyInOmniboxWithText(std::string text) {
+  [[EarlGrey selectElementWithMatcher:OmniboxText(text)]
       performAction:grey_typeText(@"\n")];
 }
 
 }  // namespace
 
 @interface QRScannerViewControllerTestCase : ChromeTestCase {
   GURL _testURL;
   GURL _testURLEdited;
   GURL _testQuery;
   GURL _testQueryEdited;
@@ skipping 37 matching lines @@
 }
 
 - (void)tearDown {
   [super tearDown];
   load_GURL_from_location_bar_swizzler_.reset();
   camera_controller_swizzler_.reset();
 }
 
 // Checks that the close button is visible, interactable, and enabled.
 - (void)assertCloseButtonIsVisible {
-  [[EarlGrey selectElementWithMatcher:qrScannerCloseButton()]
-      assertWithMatcher:visibleInteractableEnabled()];
+  [[EarlGrey selectElementWithMatcher:QrScannerCloseButton()]
+      assertWithMatcher:VisibleInteractableEnabled()];
 }
 
 // Checks that the close button is not visible.
 - (void)assertCloseButtonIsNotVisible {
-  [[EarlGrey selectElementWithMatcher:qrScannerCloseButton()]
+  [[EarlGrey selectElementWithMatcher:QrScannerCloseButton()]
       assertWithMatcher:grey_notVisible()];
 }
 
 // Checks that the torch off button is visible, interactable, and enabled, and
 // that the torch on button is not.
 - (void)assertTorchOffButtonIsVisible {
-  [[EarlGrey selectElementWithMatcher:qrScannerTorchOffButton()]
-      assertWithMatcher:visibleInteractableEnabled()];
-  [[EarlGrey selectElementWithMatcher:qrScannerTorchOnButton()]
+  [[EarlGrey selectElementWithMatcher:QrScannerTorchOffButton()]
+      assertWithMatcher:VisibleInteractableEnabled()];
+  [[EarlGrey selectElementWithMatcher:QrScannerTorchOnButton()]
       assertWithMatcher:grey_notVisible()];
 }
 
 // Checks that the torch on button is visible, interactable, and enabled, and
 // that the torch off button is not.
 - (void)assertTorchOnButtonIsVisible {
-  [[EarlGrey selectElementWithMatcher:qrScannerTorchOnButton()]
-      assertWithMatcher:visibleInteractableEnabled()];
-  [[EarlGrey selectElementWithMatcher:qrScannerTorchOffButton()]
+  [[EarlGrey selectElementWithMatcher:QrScannerTorchOnButton()]
+      assertWithMatcher:VisibleInteractableEnabled()];
+  [[EarlGrey selectElementWithMatcher:QrScannerTorchOffButton()]
       assertWithMatcher:grey_notVisible()];
 }
 
 // Checks that the torch off button is visible and disabled.
 - (void)assertTorchButtonIsDisabled {
-  [[EarlGrey selectElementWithMatcher:qrScannerTorchOffButton()]
+  [[EarlGrey selectElementWithMatcher:QrScannerTorchOffButton()]
       assertWithMatcher:grey_allOf(grey_sufficientlyVisible(),
                                    grey_not(grey_enabled()), nil)];
 }
 
 // Checks that the camera viewport caption is visible.
 - (void)assertCameraViewportCaptionIsVisible {
-  [[EarlGrey selectElementWithMatcher:qrScannerViewportCaption()]
+  [[EarlGrey selectElementWithMatcher:QrScannerViewportCaption()]
       assertWithMatcher:grey_sufficientlyVisible()];
 }
 
 // Checks that the close button, the camera preview, and the camera viewport
 // caption are visible. If |torch| is YES, checks that the torch off button is
 // visible, otherwise checks that the torch button is disabled. If |preview| is
 // YES, checks that the preview is visible and of the same size as the QR
 // Scanner view, otherwise checks that the preview is in the view hierarchy but
 // is hidden.
 - (void)assertQRScannerUIIsVisibleWithTorch:(BOOL)torch {
   [self assertCloseButtonIsVisible];
   [self assertCameraViewportCaptionIsVisible];
   if (torch) {
     [self assertTorchOffButtonIsVisible];
   } else {
     [self assertTorchButtonIsDisabled];
   }
 }
 
 // Presents the QR Scanner with a command, waits for it to be displayed, and
 // checks if all its views and buttons are visible. Checks that no alerts are
 // presented.
 - (void)showQRScannerAndCheckLayoutWithCameraMock:(id)mock {
   UIViewController* bvc = [self currentBVC];
   [self assertModalOfClass:[QRScannerViewController class]
           isNotPresentedBy:bvc];
   [self assertModalOfClass:[UIAlertController class] isNotPresentedBy:bvc];
 
   [self addCameraControllerInitializationExpectations:mock];
-  showQRScannerWithCommand();
+  ShowQRScannerWithCommand();
   [self waitForModalOfClass:[QRScannerViewController class] toAppearAbove:bvc];
   [self assertQRScannerUIIsVisibleWithTorch:NO];
   [self assertModalOfClass:[UIAlertController class]
           isNotPresentedBy:[bvc presentedViewController]];
   [self assertModalOfClass:[UIAlertController class] isNotPresentedBy:bvc];
 }
 
 // Closes the QR scanner by tapping the close button and waits for it to
 // disappear.
 - (void)closeQRScannerWithCameraMock:(id)mock {
   [self addCameraControllerDismissalExpectations:mock];
-  tapButton(qrScannerCloseButton());
+  TapButton(QrScannerCloseButton());
   [self waitForModalOfClass:[QRScannerViewController class]
        toDisappearFromAbove:[self currentBVC]];
 }
 
 // Returns the current BrowserViewController.
 - (UIViewController*)currentBVC {
   // TODO(crbug.com/629516): Evaluate moving this into a common utility.
   MainController* mainController = chrome_test_util::GetMainController();
   return [[mainController browserViewInformation] currentBVC];
 }
 
 // Checks that the omnibox is visible and contains |text|.
 - (void)assertOmniboxIsVisibleWithText:(std::string)text {
-  [[EarlGrey selectElementWithMatcher:omniboxText(text)]
+  [[EarlGrey selectElementWithMatcher:OmniboxText(text)]
       assertWithMatcher:grey_notNil()];
 }
 
 // Checks that the page that is currently loaded contains the |response|.
 - (void)assertTestURLIsLoaded:(std::string)response {
   id<GREYMatcher> testURLResponseMatcher =
-      chrome_test_util::webViewContainingText(response);
+      chrome_test_util::WebViewContainingText(response);
   [[EarlGrey selectElementWithMatcher:testURLResponseMatcher]
       assertWithMatcher:grey_notNil()];
 }
 
 #pragma mark helpers for dialogs
 
 // Checks that the modal presented by |viewController| is of class |klass|.
 - (void)assertModalOfClass:(Class)klass
              isPresentedBy:(UIViewController*)viewController {
   UIViewController* modal = [viewController presentedViewController];
@@ skipping 237 matching lines @@
   // Open the QR scanner.
   [self showQRScannerAndCheckLayoutWithCameraMock:cameraControllerMock];
 
   // Torch becomes available.
   [self callTorchAvailabilityChanged:YES];
   [self assertQRScannerUIIsVisibleWithTorch:YES];
 
   // Turn torch on.
   [self addCameraControllerTorchOnExpectations:cameraControllerMock];
   [self assertTorchOffButtonIsVisible];
-  tapButton(qrScannerTorchOffButton());
+  TapButton(QrScannerTorchOffButton());
   [self assertTorchOffButtonIsVisible];
 
   // Torch becomes active.
   [self callTorchStateChanged:YES];
   [self assertTorchOnButtonIsVisible];
 
   // Turn torch off.
   [self addCameraControllerTorchOffExpectations:cameraControllerMock];
-  tapButton(qrScannerTorchOnButton());
+  TapButton(QrScannerTorchOnButton());
   [self assertTorchOnButtonIsVisible];
 
   // Torch becomes inactive.
   [self callTorchStateChanged:NO];
   [self assertTorchOffButtonIsVisible];
 
   // Close the QR scanner.
   [self closeQRScannerWithCameraMock:cameraControllerMock];
   [cameraControllerMock verify];
 }
 
 // Tests that if the QR scanner is closed while the torch is on, the torch is
 // switched off and the correct button indicating that the torch is off is shown
 // when the scanner is opened again.
 - (void)testTorchButtonIsResetWhenQRScannerIsReopened {
   id cameraControllerMock =
       [self getCameraControllerMockWithAuthorizationStatus:
                 AVAuthorizationStatusAuthorized];
   [self swizzleCameraController:cameraControllerMock];
 
   // Open the QR scanner.
   [self showQRScannerAndCheckLayoutWithCameraMock:cameraControllerMock];
   [self assertQRScannerUIIsVisibleWithTorch:NO];
   [self callTorchAvailabilityChanged:YES];
   [self assertQRScannerUIIsVisibleWithTorch:YES];
 
   // Turn torch on.
   [self addCameraControllerTorchOnExpectations:cameraControllerMock];
-  tapButton(qrScannerTorchOffButton());
+  TapButton(QrScannerTorchOffButton());
   [self callTorchStateChanged:YES];
   [self assertTorchOnButtonIsVisible];
 
   // Close the QR scanner.
   [self closeQRScannerWithCameraMock:cameraControllerMock];
 
   // Reopen the QR scanner.
   [self showQRScannerAndCheckLayoutWithCameraMock:cameraControllerMock];
   [self callTorchAvailabilityChanged:YES];
   [self assertTorchOffButtonIsVisible];
@@ skipping 41 matching lines @@
 
   UIViewController* bvc = [self currentBVC];
   [self assertModalOfClass:[QRScannerViewController class]
           isNotPresentedBy:bvc];
   [self assertModalOfClass:[UIAlertController class] isNotPresentedBy:bvc];
   id cameraControllerMock =
       [self getCameraControllerMockWithAuthorizationStatus:
                 AVAuthorizationStatusDenied];
   [self swizzleCameraController:cameraControllerMock];
 
-  showQRScannerWithCommand();
+  ShowQRScannerWithCommand();
   [self assertModalOfClass:[QRScannerViewController class]
           isNotPresentedBy:bvc];
   [self waitForModalOfClass:[UIAlertController class] toAppearAbove:bvc];
 
-  tapButton(dialogCancelButton());
+  TapButton(DialogCancelButton());
   [self waitForModalOfClass:[UIAlertController class] toDisappearFromAbove:bvc];
 }
 
 // Tests that a UIAlertController is presented by the QRScannerViewController if
 // the camera state changes after the QRScannerViewController is presented.
 - (void)testDialogIsDisplayedIfCameraStateChanges {
 // TODO(crbug.com/663026): Reenable the test for devices.
 #if !TARGET_IPHONE_SIMULATOR
   EARL_GREY_TEST_DISABLED(@"Disabled for devices because existing system "
                           @"alerts would prevent app alerts to present "
                           @"correctly.");
 #endif
 
   id cameraControllerMock =
       [self getCameraControllerMockWithAuthorizationStatus:
                 AVAuthorizationStatusAuthorized];
   [self swizzleCameraController:cameraControllerMock];
 
   std::vector<CameraState> tests{MULTIPLE_FOREGROUND_APPS, CAMERA_UNAVAILABLE,
                                  CAMERA_PERMISSION_DENIED,
                                  CAMERA_IN_USE_BY_ANOTHER_APPLICATION};
 
   for (const CameraState& state : tests) {
     [self showQRScannerAndCheckLayoutWithCameraMock:cameraControllerMock];
     [self callCameraStateChanged:state];
     [self assertQRScannerIsPresentingADialogForState:state];
 
     // Close the dialog.
     [self addCameraControllerDismissalExpectations:cameraControllerMock];
-    tapButton(dialogCancelButton());
+    TapButton(DialogCancelButton());
     UIViewController* bvc = [self currentBVC];
     [self waitForModalOfClass:[QRScannerViewController class]
          toDisappearFromAbove:bvc];
     [self assertModalOfClass:[UIAlertController class] isNotPresentedBy:bvc];
   }
 
   [cameraControllerMock verify];
 }
 
 // Tests that a new dialog replaces an old dialog if the camera state changes.
@@ skipping 22 matching lines @@
 
   for (const CameraState& state : tests) {
     [self callCameraStateChanged:state];
     [self assertQRScannerIsPresentingADialogForState:state];
     [self assertQRScannerIsNotPresentingADialogForState:currentState];
     currentState = state;
   }
 
   // Cancel the dialog.
   [self addCameraControllerDismissalExpectations:cameraControllerMock];
-  tapButton(dialogCancelButton());
+  TapButton(DialogCancelButton());
   [self waitForModalOfClass:[QRScannerViewController class]
        toDisappearFromAbove:[self currentBVC]];
   [self assertModalOfClass:[UIAlertController class]
           isNotPresentedBy:[self currentBVC]];
 
   [cameraControllerMock verify];
 }
 
 // Tests that an error dialog is dismissed if the camera becomes available.
 - (void)testDialogDismissedIfCameraBecomesAvailable {
@@ skipping 45 matching lines @@
   [self addCameraControllerDismissalExpectations:cameraControllerMock];
   [self callReceiveQRScannerResult:base::SysUTF8ToNSString(result)];
 
   [self waitForModalOfClass:[QRScannerViewController class]
        toDisappearFromAbove:[self currentBVC]];
   [cameraControllerMock verify];
 
   // Optionally edit the text in the omnibox before pressing return.
   [self assertOmniboxIsVisibleWithText:result];
   if (editString != nil) {
-    editOmniboxTextAndTapKeyboardReturn(result, editString);
+    EditOmniboxTextAndTapKeyboardReturn(result, editString);
   } else {
-    tapKeyboardReturnKeyInOmniboxWithText(result);
+    TapKeyboardReturnKeyInOmniboxWithText(result);
   }
   [self assertTestURLIsLoaded:response];
 
   // Press the back button to get back to the NTP.
-  tapButton(webToolbarBackButton());
+  TapButton(WebToolbarBackButton());
   [self assertModalOfClass:[QRScannerViewController class]
           isNotPresentedBy:[self currentBVC]];
 }
 
 // Test that the correct page is loaded if the scanner result is a URL.
 - (void)testReceivingQRScannerURLResult {
   [self doTestReceivingResult:_testURL.GetContent()
                      response:kTestURLResponse
                          edit:nil];
 }
@@ skipping 15 matching lines @@
 // Test that the correct page is loaded if the scanner result is a search query
 // which is then manually edited.
 - (void)testReceivingQRScannerSearchQueryResultAndEditingTheQuery {
   [self swizzleWebToolbarControllerLoadGURLFromLocationBar:_testQueryEdited];
   [self doTestReceivingResult:kTestQuery
                      response:kTestQueryEditedResponse
                          edit:@"\bedited"];
 }
 
 @end