Make EarlGrey matchers compliant with Chromium style.

ios/chrome/browser/ui/tools_menu/tools_popup_menu_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>
 #import <XCTest/XCTest.h>
 
 #include "base/strings/sys_string_conversions.h"
 #include "components/strings/grit/components_strings.h"
 #import "ios/chrome/browser/ui/chrome_web_view_factory.h"
@@ skipping 39 matching lines @@
         userAgent == kDesktopUserAgent) {
       response_body->assign("Desktop");
     } else {
       response_body->assign("Mobile");
     }
   }
 };
 
 // Matcher for the button to find in page.
 id<GREYMatcher> FindInPageButton() {
-  return chrome_test_util::buttonWithAccessibilityLabel(
+  return chrome_test_util::ButtonWithAccessibilityLabel(
       l10n_util::GetNSStringWithFixup(IDS_IOS_TOOLS_MENU_FIND_IN_PAGE));
 }
 
 // Matcher for the button to request desktop version.
 id<GREYMatcher> RequestDesktopButton() {
   return grey_accessibilityID(kToolsMenuRequestDesktopId);
 }
 
 // Matcher for the navigate backward button.
 id<GREYMatcher> BackButton() {
-  return chrome_test_util::buttonWithAccessibilityLabelId(IDS_ACCNAME_BACK);
+  return chrome_test_util::ButtonWithAccessibilityLabelId(IDS_ACCNAME_BACK);

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

Could you please use existing matcher from chrome_matchers instead.

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

Done.

 }
 
 const char kPDFURL[] = "http://ios/testing/data/http_server_files/testpage.pdf";
 
 }  // namespace
 
 // Tests for the tools popup menu.
 @interface ToolsPopupMenuTestCase : ChromeTestCase
 - (void)verifyMobileAndDesktopVersions:(const GURL&)url;
 @end
 
 @implementation ToolsPopupMenuTestCase
 
 // Verify that requesting desktop and mobile versions works.
 - (void)verifyMobileAndDesktopVersions:(const GURL&)url {
   NSString* const kMobileSiteLabel = @"Mobile";
   NSString* const kDesktopSiteLabel = @"Desktop";
 
   [ChromeEarlGrey loadURL:url];
 
   // Verify initial reception of the mobile site.
   [[EarlGrey
-      selectElementWithMatcher:chrome_test_util::webViewContainingText(
+      selectElementWithMatcher:chrome_test_util::WebViewContainingText(
                                    base::SysNSStringToUTF8(kMobileSiteLabel))]
       assertWithMatcher:grey_notNil()];
 
   // Request and verify reception of the desktop site.
   [ChromeEarlGreyUI openToolsMenu];
   [[EarlGrey selectElementWithMatcher:RequestDesktopButton()]
       performAction:grey_tap()];
   [[EarlGrey
-      selectElementWithMatcher:chrome_test_util::webViewContainingText(
+      selectElementWithMatcher:chrome_test_util::WebViewContainingText(
                                    base::SysNSStringToUTF8(kDesktopSiteLabel))]
       assertWithMatcher:grey_notNil()];
 
   // Verify that going back returns to the mobile site.
   [[EarlGrey selectElementWithMatcher:BackButton()] performAction:grey_tap()];
   [[EarlGrey
-      selectElementWithMatcher:chrome_test_util::webViewContainingText(
+      selectElementWithMatcher:chrome_test_util::WebViewContainingText(
                                    base::SysNSStringToUTF8(kMobileSiteLabel))]
       assertWithMatcher:grey_notNil()];
 }
 
 // Tests that the menu is closed when tapping the close button.
 - (void)testOpenAndCloseToolsMenu {
   [ChromeEarlGreyUI openToolsMenu];
 
   if (!IsCompact()) {
     [[EarlGrey
         selectElementWithMatcher:grey_accessibilityLabel(l10n_util::GetNSString(
                                      IDS_IOS_TOOLBAR_CLOSE_MENU))]
         performAction:grey_tap()];
   } else {
-    [[EarlGrey selectElementWithMatcher:chrome_test_util::toolsMenuButton()]
+    [[EarlGrey selectElementWithMatcher:chrome_test_util::ToolsMenuButton()]
         performAction:grey_tap()];
   }
 
   [[EarlGrey
       selectElementWithMatcher:grey_accessibilityID(kToolsMenuTableViewId)]
       assertWithMatcher:grey_notVisible()];
 }
 
 // Navigates to a pdf page and verifies that the "Find in Page..." tool
 // is not enabled
@@ skipping 33 matching lines @@
 
 // Open tools menu and verify elements are accessible.
 - (void)testAccessibilityOnToolsMenu {
   [ChromeEarlGreyUI openToolsMenu];
   chrome_test_util::VerifyAccessibilityForCurrentScreen();
   // Close Tools menu.
   [ChromeTestCase removeAnyOpenMenusAndInfoBars];
 }
 
 @end