Make EarlGrey matchers compliant with Chromium style.

ios/chrome/browser/web/push_and_replace_state_navigation_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 <XCTest/XCTest.h>
 
 #include "base/strings/sys_string_conversions.h"
 #include "components/strings/grit/components_strings.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #import "ios/chrome/test/earl_grey/chrome_earl_grey.h"
@@ skipping 14 matching lines @@
     "http://ios/testing/data/http_server_files/history.html#replaceWithObject";
 const char* kPushStateHashStringURL =
     "http://ios/testing/data/http_server_files/history.html#string";
 const char* kReplaceStateHashStringURL =
     "http://ios/testing/data/http_server_files/history.html#replace";
 const char* kPushStatePathURL =
     "http://ios/testing/data/http_server_files/path";
 const char* kReplaceStateRootPathSpaceURL = "http://ios/rep lace";
 
 // Matcher for the navigate forward button.
-id<GREYMatcher> forwardButton() {
-  return chrome_test_util::buttonWithAccessibilityLabelId(IDS_ACCNAME_FORWARD);
+id<GREYMatcher> ForwardButton() {

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

Could you please use existing matchers from chrome_matchers.

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

Done.

+  return chrome_test_util::ButtonWithAccessibilityLabelId(IDS_ACCNAME_FORWARD);
 }
 // Matcher for the navigate backward button.
-id<GREYMatcher> backButton() {
-  return chrome_test_util::buttonWithAccessibilityLabelId(IDS_ACCNAME_BACK);
+id<GREYMatcher> BackButton() {
+  return chrome_test_util::ButtonWithAccessibilityLabelId(IDS_ACCNAME_BACK);
 }
 }  // namespace
 
 // Tests for pushState/replaceState navigations.
 @interface PushAndReplaceStateNavigationTestCase : ChromeTestCase
 @end
 
 @implementation PushAndReplaceStateNavigationTestCase
 
 // Tests calling history.pushState() multiple times and navigating back/forward.
@@ skipping 18 matching lines @@
                  withURL:pushStateRootPathURL
               pageLoaded:NO];
 
   [ChromeEarlGrey tapWebViewElementWithID:@"pushStatePathSpace"];
   [self assertStatusText:@"pushStatePathSpace"
                  withURL:pushStatePathSpaceURL
               pageLoaded:NO];
 
   // Go back and check that the page doesn't load and the status text is updated
   // by the popstate event.
-  [[EarlGrey selectElementWithMatcher:backButton()] performAction:grey_tap()];
+  [[EarlGrey selectElementWithMatcher:BackButton()] performAction:grey_tap()];
   [self assertStatusText:@"pushStateRootPath"
                  withURL:pushStateRootPathURL
               pageLoaded:NO];
 
-  [[EarlGrey selectElementWithMatcher:backButton()] performAction:grey_tap()];
+  [[EarlGrey selectElementWithMatcher:BackButton()] performAction:grey_tap()];
   [self assertStatusText:@"pushStateHashWithObject"
                  withURL:pushStateHashWithObjectURL
               pageLoaded:NO];
 
   [ChromeEarlGrey tapWebViewElementWithID:@"goBack"];
   const GURL historyTestURL = web::test::HttpServer::MakeUrl(kHistoryTestUrl);
   [self assertStatusText:NULL withURL:historyTestURL pageLoaded:NO];
 
   // Go forward 2 pages and check that the page doesn't load and the status text
   // is updated by the popstate event.
@@ skipping 11 matching lines @@
   [ChromeEarlGrey loadURL:web::test::HttpServer::MakeUrl(kHistoryTestUrl)];
 
   // Replace the URL and go back then forward.
   const GURL replaceStateHashWithObjectURL =
       web::test::HttpServer::MakeUrl(kReplaceStateHashWithObjectURL);
   [ChromeEarlGrey tapWebViewElementWithID:@"replaceStateHashWithObject"];
   [self assertStatusText:@"replaceStateHashWithObject"
                  withURL:replaceStateHashWithObjectURL
               pageLoaded:NO];
 
-  [[EarlGrey selectElementWithMatcher:backButton()] performAction:grey_tap()];
-  [[EarlGrey selectElementWithMatcher:chrome_test_util::omniboxText(
+  [[EarlGrey selectElementWithMatcher:BackButton()] performAction:grey_tap()];
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::OmniboxText(
                                           initialURL.GetContent())]
       assertWithMatcher:grey_notNil()];
 
-  [[EarlGrey selectElementWithMatcher:forwardButton()]
+  [[EarlGrey selectElementWithMatcher:ForwardButton()]
       performAction:grey_tap()];
   [self assertStatusText:@"replaceStateHashWithObject"
                  withURL:replaceStateHashWithObjectURL
               pageLoaded:YES];
 
   // Push URL then replace it. Do this twice.
   const GURL pushStateHashStringURL =
       web::test::HttpServer::MakeUrl(kPushStateHashStringURL);
   [ChromeEarlGrey tapWebViewElementWithID:@"pushStateHashString"];
   [self assertStatusText:@"pushStateHashString"
@@ skipping 15 matching lines @@
               pageLoaded:NO];
 
   const GURL replaceStateRootPathSpaceURL =
       web::test::HttpServer::MakeUrl(kReplaceStateRootPathSpaceURL);
   [ChromeEarlGrey tapWebViewElementWithID:@"replaceStateRootPathSpace"];
   [self assertStatusText:@"replaceStateRootPathSpace"
                  withURL:replaceStateRootPathSpaceURL
               pageLoaded:NO];
 
   // Go back and check URLs.
-  [[EarlGrey selectElementWithMatcher:backButton()] performAction:grey_tap()];
+  [[EarlGrey selectElementWithMatcher:BackButton()] performAction:grey_tap()];
   [self assertStatusText:@"replaceStateHashString"
                  withURL:replaceStateHashStringURL
               pageLoaded:NO];
-  [[EarlGrey selectElementWithMatcher:backButton()] performAction:grey_tap()];
+  [[EarlGrey selectElementWithMatcher:BackButton()] performAction:grey_tap()];
   [self assertStatusText:@"replaceStateHashWithObject"
                  withURL:replaceStateHashWithObjectURL
               pageLoaded:NO];
 
   // Go forward and check URL.
   [ChromeEarlGrey tapWebViewElementWithID:@"goForward2"];
   [self assertStatusText:@"replaceStateRootPathSpace"
                  withURL:replaceStateRootPathSpaceURL
               pageLoaded:NO];
 }
@@ skipping 24 matching lines @@
   [ChromeEarlGrey loadURL:historyTestURL];
   [ChromeEarlGrey tapWebViewElementWithID:@"pushStateHashString"];
   [self assertStatusText:@"pushStateHashString"
                  withURL:pushStateHashStringURL
               pageLoaded:NO];
 
   // At this point the history looks like this:
   // [NTP, history.html, #string, #string, nonPushedURL, history.html, #string]
 
   // Go back (to second history.html) and verify page did not load.
-  [[EarlGrey selectElementWithMatcher:backButton()] performAction:grey_tap()];
+  [[EarlGrey selectElementWithMatcher:BackButton()] performAction:grey_tap()];
   [self assertStatusText:nil withURL:historyTestURL pageLoaded:NO];
 
   // Go back twice (to second #string) and verify page did load.
-  [[EarlGrey selectElementWithMatcher:backButton()] performAction:grey_tap()];
-  [[EarlGrey selectElementWithMatcher:backButton()] performAction:grey_tap()];
+  [[EarlGrey selectElementWithMatcher:BackButton()] performAction:grey_tap()];
+  [[EarlGrey selectElementWithMatcher:BackButton()] performAction:grey_tap()];
   [self assertStatusText:nil withURL:pushStateHashStringURL pageLoaded:YES];
 
   // Go back once (to first #string) and verify page did not load.
-  [[EarlGrey selectElementWithMatcher:backButton()] performAction:grey_tap()];
+  [[EarlGrey selectElementWithMatcher:BackButton()] performAction:grey_tap()];
   [self assertStatusText:@"pushStateHashString"
                  withURL:pushStateHashStringURL
               pageLoaded:NO];
 
   // Go forward 4 entries at once (to third #string) and verify page did load.
   [ChromeEarlGrey tapWebViewElementWithID:@"goForward4"];
 
   [self assertStatusText:nil withURL:pushStateHashStringURL pageLoaded:YES];
 
   // Go back 4 entries at once (to first #string) and verify page did load.
@@ skipping 17 matching lines @@
 
   web::test::SetUpFileBasedHttpServer();
   [ChromeEarlGrey loadURL:web::test::HttpServer::MakeUrl(kHistoryTestUrl)];
 
   // TODO(crbug.com/643458): The fact that the URL shows %-escaped is due to
   // NSURL escaping to make UIWebView/JS happy. See if it's possible to
   // represent differently such that it displays unescaped.
   // Do 2 push states with unicode characters.
   [ChromeEarlGrey tapWebViewElementWithID:@"pushStateUnicode"];
   [[EarlGrey
-      selectElementWithMatcher:chrome_test_util::omniboxText(
+      selectElementWithMatcher:chrome_test_util::OmniboxText(
                                    pushStateUnicodeURLEncoded.GetContent())]
       assertWithMatcher:grey_notNil()];
-  [[EarlGrey selectElementWithMatcher:chrome_test_util::webViewContainingText(
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewContainingText(
                                           pushStateUnicodeLabel)]
       assertWithMatcher:grey_notNil()];
 
   [ChromeEarlGrey tapWebViewElementWithID:@"pushStateUnicode2"];
   [[EarlGrey
-      selectElementWithMatcher:chrome_test_util::omniboxText(
+      selectElementWithMatcher:chrome_test_util::OmniboxText(
                                    pushStateUnicode2URLEncoded.GetContent())]
       assertWithMatcher:grey_notNil()];
-  [[EarlGrey selectElementWithMatcher:chrome_test_util::webViewContainingText(
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::WebViewContainingText(
                                           pushStateUnicode2Label)]
       assertWithMatcher:grey_notNil()];
 
   // Do a push state without a unicode character.
   const GURL pushStatePathURL =
       web::test::HttpServer::MakeUrl(kPushStatePathURL);
   [ChromeEarlGrey tapWebViewElementWithID:@"pushStatePath"];
 
   [self assertStatusText:@"pushStatePath"
                  withURL:pushStatePathURL
               pageLoaded:NO];
 
   // Go back and check the unicode in the URL and status.
-  [[EarlGrey selectElementWithMatcher:backButton()] performAction:grey_tap()];
+  [[EarlGrey selectElementWithMatcher:BackButton()] performAction:grey_tap()];
   [self assertStatusText:pushStateUnicode2Status
                  withURL:pushStateUnicode2URLEncoded
               pageLoaded:NO];
 
-  [[EarlGrey selectElementWithMatcher:backButton()] performAction:grey_tap()];
+  [[EarlGrey selectElementWithMatcher:BackButton()] performAction:grey_tap()];
   [self assertStatusText:pushStateUnicodeStatus
                  withURL:pushStateUnicodeURLEncoded
               pageLoaded:NO];
 }
 
 // Tests that pushState/replaceState handling properly handles <base>.
 - (void)testHtml5HistoryWithBase {
   std::map<GURL, std::string> responses;
   GURL originURL =
       web::test::HttpServer::MakeUrl("http://foo.com/foo/bar.html");
@@ skipping 13 matching lines @@
        "id=\"replaceState\" onclick=\"history.replaceState("
        "{}, 'Foo', './replaced/relative/url');\"><br>";
   NSString* simplePage =
       @"<!doctype html><html><head>%@</head><body>%@</body></html>";
   responses[originURL] = base::SysNSStringToUTF8(
       [NSString stringWithFormat:simplePage, baseTag, pushAndReplaceButtons]);
   web::test::SetUpSimpleHttpServer(responses);
 
   [ChromeEarlGrey loadURL:originURL];
   [ChromeEarlGrey tapWebViewElementWithID:@"pushState"];
-  [[EarlGrey selectElementWithMatcher:chrome_test_util::omniboxText(
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::OmniboxText(
                                           pushResultURL.GetContent())]
       assertWithMatcher:grey_notNil()];
 
   [ChromeEarlGrey tapWebViewElementWithID:@"replaceState"];
-  [[EarlGrey selectElementWithMatcher:chrome_test_util::omniboxText(
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::OmniboxText(
                                           replaceResultURL.GetContent())]
       assertWithMatcher:grey_notNil()];
 }
 
 #pragma mark - Utility methods
 
 // Assert that status text |status| is displayed in the webview, that "onloaded"
 // text is displayed if pageLoaded is YES, and that the URL is as expected.
 - (void)assertStatusText:(NSString*)status
                  withURL:(const GURL&)urlToVerify
               pageLoaded:(BOOL)pageLoaded {
   id<GREYMatcher> pageLoadedMatcher =
-      pageLoaded ? chrome_test_util::webViewContainingText("onload")
-                 : chrome_test_util::webViewNotContainingText("onload");
+      pageLoaded ? chrome_test_util::WebViewContainingText("onload")
+                 : chrome_test_util::WebViewNotContainingText("onload");
   [[EarlGrey selectElementWithMatcher:pageLoadedMatcher]
       assertWithMatcher:grey_notNil()];
 
   if (status != NULL) {
     NSString* statusLabel = [NSString stringWithFormat:@"Action: %@", status];
     [[EarlGrey
-        selectElementWithMatcher:chrome_test_util::webViewContainingText(
+        selectElementWithMatcher:chrome_test_util::WebViewContainingText(
                                      base::SysNSStringToUTF8(statusLabel))]
         assertWithMatcher:grey_notNil()];
   }
 
-  [[EarlGrey selectElementWithMatcher:chrome_test_util::omniboxText(
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::OmniboxText(
                                           urlToVerify.GetContent())]
       assertWithMatcher:grey_notNil()];
 }
 
 @end