Make EarlGrey matchers compliant with Chromium style.

ios/chrome/browser/web/visible_url_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/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "ios/chrome/browser/experimental_flags.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #import "ios/chrome/test/app/chrome_test_util.h"
 #import "ios/chrome/test/earl_grey/chrome_earl_grey.h"
 #import "ios/chrome/test/earl_grey/chrome_earl_grey_ui.h"
 #import "ios/chrome/test/earl_grey/chrome_matchers.h"
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
 #import "ios/testing/earl_grey/disabled_test_macros.h"
 #import "ios/web/public/test/http_server.h"
 #include "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::omniboxText;
+using chrome_test_util::WebViewContainingText;
+using chrome_test_util::OmniboxText;
 
 namespace {
 
 const char kTestPage1[] = "Test Page 1";
 const char kTestPage2[] = "Test Page 2";
 const char kTestPage3[] = "Test Page 3";
 const char kGoBackLink[] = "go-back";
 const char kGoForwardLink[] = "go-forward";
 const char kGoNegativeDeltaLink[] = "go-negative-delta";
 const char kGoPositiveDeltaLink[] = "go-positive-delta";
@@ skipping 143 matching lines @@
     EARL_GREY_TEST_SKIPPED(@"Pending Index Navigation experiment is disabled");
   }
 
   // Purge web view caches and pause the server to make sure that tests can
   // verify omnibox state before server starts responding.
   PurgeCachedWebViewPages();
   [self setServerPaused:YES];
 
   // Tap the back button in the toolbar and verify that URL2 (committed URL) is
   // displayed even though URL1 is a pending URL.
-  [[EarlGrey selectElementWithMatcher:chrome_test_util::backButton()]
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::BackButton()]
       performAction:grey_tap()];
   GREYAssert([self waitForServerToReceiveRequestWithURL:_testURL1],
              @"Last request URL: %@", self.lastRequestURLSpec);
-  [[EarlGrey selectElementWithMatcher:omniboxText(_testURL2.GetContent())]
+  [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL2.GetContent())]
       assertWithMatcher:grey_notNil()];
 
   // Make server respond so URL1 becomes committed.
   [self setServerPaused:NO];
-  [[EarlGrey selectElementWithMatcher:webViewContainingText(kTestPage1)]
+  [[EarlGrey selectElementWithMatcher:WebViewContainingText(kTestPage1)]
       assertWithMatcher:grey_notNil()];
-  [[EarlGrey selectElementWithMatcher:omniboxText(_testURL1.GetContent())]
+  [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL1.GetContent())]
       assertWithMatcher:grey_notNil()];
 
   // Purge web view caches and pause the server to make sure that tests can
   // verify omnibox state before server starts responding.
   PurgeCachedWebViewPages();
   [self setServerPaused:YES];
 
   // Tap the forward button in the toolbar and verify that URL1 (committed URL)
   // is displayed even though URL2 is a pending URL.
-  [[EarlGrey selectElementWithMatcher:chrome_test_util::forwardButton()]
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::ForwardButton()]
       performAction:grey_tap()];
   GREYAssert([self waitForServerToReceiveRequestWithURL:_testURL2],
              @"Last request URL: %@", self.lastRequestURLSpec);
-  [[EarlGrey selectElementWithMatcher:omniboxText(_testURL1.GetContent())]
+  [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL1.GetContent())]
       assertWithMatcher:grey_notNil()];
 
   // Make server respond so URL2 becomes committed.
   [self setServerPaused:NO];
-  [[EarlGrey selectElementWithMatcher:webViewContainingText(kTestPage2)]
+  [[EarlGrey selectElementWithMatcher:WebViewContainingText(kTestPage2)]
       assertWithMatcher:grey_notNil()];
-  [[EarlGrey selectElementWithMatcher:omniboxText(_testURL2.GetContent())]
+  [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL2.GetContent())]
       assertWithMatcher:grey_notNil()];
 }
 
 // Tests that visible URL is always the same as last committed URL during
 // pending navigations initialted from back history popover.
 - (void)testHistoryNavigation {
   if (!experimental_flags::IsPendingIndexNavigationEnabled()) {
     EARL_GREY_TEST_SKIPPED(@"Pending Index Navigation experiment is disabled");
   }
 
   // Purge web view caches and pause the server to make sure that tests can
   // verify omnibox state before server starts responding.
   PurgeCachedWebViewPages();
   [self setServerPaused:YES];
 
   // Go back in history and verify that URL2 (committed URL) is displayed even
   // though URL1 is a pending URL.
-  [[EarlGrey selectElementWithMatcher:chrome_test_util::backButton()]
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::BackButton()]
       performAction:grey_longPress()];
   NSString* URL1Spec = base::SysUTF8ToNSString(_testURL1.spec());
   [[EarlGrey selectElementWithMatcher:grey_text(URL1Spec)]
       performAction:grey_tap()];
   GREYAssert([self waitForServerToReceiveRequestWithURL:_testURL1],
              @"Last request URL: %@", self.lastRequestURLSpec);
-  [[EarlGrey selectElementWithMatcher:omniboxText(_testURL2.GetContent())]
+  [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL2.GetContent())]
       assertWithMatcher:grey_notNil()];
 
   // Make server respond so URL1 becomes committed.
   [self setServerPaused:NO];
-  [[EarlGrey selectElementWithMatcher:webViewContainingText(kTestPage1)]
+  [[EarlGrey selectElementWithMatcher:WebViewContainingText(kTestPage1)]
       assertWithMatcher:grey_notNil()];
-  [[EarlGrey selectElementWithMatcher:omniboxText(_testURL1.GetContent())]
+  [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL1.GetContent())]
       assertWithMatcher:grey_notNil()];
 }
 
 // Tests that stopping a pending Back navigation and reloading reloads committed
 // URL, not pending URL.
 - (void)testStoppingPendingBackNavigationAndReload {
   if (!experimental_flags::IsPendingIndexNavigationEnabled()) {
     EARL_GREY_TEST_SKIPPED(@"Pending Index Navigation experiment is disabled");
   }
 
   // Purge web view caches and pause the server to make sure that tests can
   // verify omnibox state before server starts responding.
   PurgeCachedWebViewPages();
   [self setServerPaused:YES];
 
   // Tap the back button, stop pending navigation and reload.
-  [[EarlGrey selectElementWithMatcher:chrome_test_util::backButton()]
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::BackButton()]
       performAction:grey_tap()];
   GREYAssert([self waitForServerToReceiveRequestWithURL:_testURL1],
              @"Last request URL: %@", self.lastRequestURLSpec);
   // On iPhone Stop/Reload button is a part of tools menu, so open it.
   if (!IsIPadIdiom()) {
     // Enable EG synchronization to make test wait for popover animations.
     [[GREYConfiguration sharedInstance]
             setValue:@YES
         forConfigKey:kGREYConfigKeySynchronizationEnabled];
     [ChromeEarlGreyUI openToolsMenu];
   }
-  [[EarlGrey selectElementWithMatcher:chrome_test_util::stopButton()]
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::StopButton()]
       performAction:grey_tap()];
   [ChromeEarlGreyUI reload];
 
   // Make server respond and verify that page2 was reloaded, not page1.
   [self setServerPaused:NO];
-  [[EarlGrey selectElementWithMatcher:webViewContainingText(kTestPage2)]
+  [[EarlGrey selectElementWithMatcher:WebViewContainingText(kTestPage2)]
       assertWithMatcher:grey_notNil()];
-  [[EarlGrey selectElementWithMatcher:omniboxText(_testURL2.GetContent())]
+  [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL2.GetContent())]
       assertWithMatcher:grey_notNil()];
 }
 
 // Tests that visible URL is always the same as last committed URL during
 // back forward navigations initiated with JS.
 - (void)testJSBackForwardNavigation {
   if (!experimental_flags::IsPendingIndexNavigationEnabled()) {
     EARL_GREY_TEST_SKIPPED(@"Pending Index Navigation experiment is disabled");
   }
 
   // Purge web view caches and pause the server to make sure that tests can
   // verify omnibox state before server starts responding.
   PurgeCachedWebViewPages();
   [self setServerPaused:YES];
 
   // Tap the back button on the page and verify that URL2 (committed URL) is
   // displayed even though URL1 is a pending URL.
   [ChromeEarlGrey tapWebViewElementWithID:base::SysUTF8ToNSString(kGoBackLink)];
   GREYAssert([self waitForServerToReceiveRequestWithURL:_testURL1],
              @"Last request URL: %@", self.lastRequestURLSpec);
-  [[EarlGrey selectElementWithMatcher:omniboxText(_testURL2.GetContent())]
+  [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL2.GetContent())]
       assertWithMatcher:grey_notNil()];
 
   // Make server respond so URL1 becomes committed.
   [self setServerPaused:NO];
-  [[EarlGrey selectElementWithMatcher:webViewContainingText(kTestPage1)]
+  [[EarlGrey selectElementWithMatcher:WebViewContainingText(kTestPage1)]
       assertWithMatcher:grey_notNil()];
-  [[EarlGrey selectElementWithMatcher:omniboxText(_testURL1.GetContent())]
+  [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL1.GetContent())]
       assertWithMatcher:grey_notNil()];
 
   // Purge web view caches and pause the server to make sure that tests can
   // verify omnibox state before server starts responding.
   PurgeCachedWebViewPages();
   [self setServerPaused:YES];
 
   // Tap the forward button on the page and verify that URL1 (committed URL)
   // is displayed even though URL2 is a pending URL.
   [ChromeEarlGrey
       tapWebViewElementWithID:base::SysUTF8ToNSString(kGoForwardLink)];
   GREYAssert([self waitForServerToReceiveRequestWithURL:_testURL2],
              @"Last request URL: %@", self.lastRequestURLSpec);
-  [[EarlGrey selectElementWithMatcher:omniboxText(_testURL1.GetContent())]
+  [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL1.GetContent())]
       assertWithMatcher:grey_notNil()];
 
   // Make server respond so URL2 becomes committed.
   [self setServerPaused:NO];
-  [[EarlGrey selectElementWithMatcher:webViewContainingText(kTestPage2)]
+  [[EarlGrey selectElementWithMatcher:WebViewContainingText(kTestPage2)]
       assertWithMatcher:grey_notNil()];
-  [[EarlGrey selectElementWithMatcher:omniboxText(_testURL2.GetContent())]
+  [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL2.GetContent())]
       assertWithMatcher:grey_notNil()];
 }
 
 // Tests that visible URL is always the same as last committed URL during go
 // navigations initiated with JS.
 - (void)testJSGoNavigation {
   if (!experimental_flags::IsPendingIndexNavigationEnabled()) {
     EARL_GREY_TEST_SKIPPED(@"Pending Index Navigation experiment is disabled");
   }
 
   // Purge web view caches and pause the server to make sure that tests can
   // verify omnibox state before server starts responding.
   PurgeCachedWebViewPages();
   [self setServerPaused:YES];
 
   // Tap the go negative delta button on the page and verify that URL2
   // (committed URL) is displayed even though URL1 is a pending URL.
   [ChromeEarlGrey
       tapWebViewElementWithID:base::SysUTF8ToNSString(kGoNegativeDeltaLink)];
   GREYAssert([self waitForServerToReceiveRequestWithURL:_testURL1],
              @"Last request URL: %@", self.lastRequestURLSpec);
-  [[EarlGrey selectElementWithMatcher:omniboxText(_testURL2.GetContent())]
+  [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL2.GetContent())]
       assertWithMatcher:grey_notNil()];
 
   // Make server respond so URL1 becomes committed.
   [self setServerPaused:NO];
-  [[EarlGrey selectElementWithMatcher:webViewContainingText(kTestPage1)]
+  [[EarlGrey selectElementWithMatcher:WebViewContainingText(kTestPage1)]
       assertWithMatcher:grey_notNil()];
-  [[EarlGrey selectElementWithMatcher:omniboxText(_testURL1.GetContent())]
+  [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL1.GetContent())]
       assertWithMatcher:grey_notNil()];
 
   // Purge web view caches and pause the server to make sure that tests can
   // verify omnibox state before server starts responding.
   PurgeCachedWebViewPages();
   [self setServerPaused:YES];
 
   // Tap go positive delta button on the page and verify that URL1 (committed
   // URL) is displayed even though URL2 is a pending URL.
   [ChromeEarlGrey
       tapWebViewElementWithID:base::SysUTF8ToNSString(kGoPositiveDeltaLink)];
   GREYAssert([self waitForServerToReceiveRequestWithURL:_testURL2],
              @"Last request URL: %@", self.lastRequestURLSpec);
-  [[EarlGrey selectElementWithMatcher:omniboxText(_testURL1.GetContent())]
+  [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL1.GetContent())]
       assertWithMatcher:grey_notNil()];
 
   // Make server respond so URL2 becomes committed.
   [self setServerPaused:NO];
-  [[EarlGrey selectElementWithMatcher:webViewContainingText(kTestPage2)]
+  [[EarlGrey selectElementWithMatcher:WebViewContainingText(kTestPage2)]
       assertWithMatcher:grey_notNil()];
-  [[EarlGrey selectElementWithMatcher:omniboxText(_testURL2.GetContent())]
+  [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL2.GetContent())]
       assertWithMatcher:grey_notNil()];
 }
 
 // Tests that visible URL is always the same as last committed URL during go
 // back navigation started with pending reload in progress.
 - (void)testBackNavigationWithPendingReload {
   if (!experimental_flags::IsPendingIndexNavigationEnabled()) {
     EARL_GREY_TEST_SKIPPED(@"Pending Index Navigation experiment is disabled");
   }
 
   // Purge web view caches and pause the server to make sure that tests can
   // verify omnibox state before server starts responding.
   PurgeCachedWebViewPages();
   [self setServerPaused:YES];
 
   // Start reloading the page.
   if (!IsIPadIdiom()) {
     // Enable EG synchronization to make test wait for popover animations.
     [[GREYConfiguration sharedInstance]
             setValue:@YES
         forConfigKey:kGREYConfigKeySynchronizationEnabled];
     [ChromeEarlGreyUI openToolsMenu];
   }
-  [[EarlGrey selectElementWithMatcher:chrome_test_util::reloadButton()]
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::ReloadButton()]
       performAction:grey_tap()];
 
   // Do not wait until reload is finished, tap the back button in the toolbar
   // and verify that URL2 (committed URL) is displayed even though URL1 is a
   // pending URL.
-  [[EarlGrey selectElementWithMatcher:chrome_test_util::backButton()]
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::BackButton()]
       performAction:grey_tap()];
   GREYAssert([self waitForServerToReceiveRequestWithURL:_testURL1],
              @"Last request URL: %@", self.lastRequestURLSpec);
-  [[EarlGrey selectElementWithMatcher:omniboxText(_testURL2.GetContent())]
+  [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL2.GetContent())]
       assertWithMatcher:grey_notNil()];
 
   // Make server respond so URL1 becomes committed.
   [self setServerPaused:NO];
-  [[EarlGrey selectElementWithMatcher:webViewContainingText(kTestPage1)]
+  [[EarlGrey selectElementWithMatcher:WebViewContainingText(kTestPage1)]
       assertWithMatcher:grey_notNil()];
-  [[EarlGrey selectElementWithMatcher:omniboxText(_testURL1.GetContent())]
+  [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL1.GetContent())]
       assertWithMatcher:grey_notNil()];
 }
 
 // Tests that visible URL is always the same as last committed URL during go
 // back navigation initiated with pending renderer-initiated navigation in
 // progress.
 - (void)testBackNavigationWithPendingRendererInitiatedNavigation {
   if (!experimental_flags::IsPendingIndexNavigationEnabled()) {
     EARL_GREY_TEST_SKIPPED(@"Pending Index Navigation experiment is disabled");
   }
 
   // Purge web view caches and pause the server to make sure that tests can
   // verify omnibox state before server starts responding.
   PurgeCachedWebViewPages();
   [self setServerPaused:YES];
 
   // Start renderer initiated navigation.
   [ChromeEarlGrey tapWebViewElementWithID:base::SysUTF8ToNSString(kPage3Link)];
 
   // Do not wait until renderer-initiated navigation is finished, tap the back
   // button in the toolbar and verify that URL2 (committed URL) is displayed
   // even though URL1 is a pending URL.
-  [[EarlGrey selectElementWithMatcher:chrome_test_util::backButton()]
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::BackButton()]
       performAction:grey_tap()];
   GREYAssert([self waitForServerToReceiveRequestWithURL:_testURL1],
              @"Last request URL: %@", self.lastRequestURLSpec);
-  [[EarlGrey selectElementWithMatcher:omniboxText(_testURL2.GetContent())]
+  [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL2.GetContent())]
       assertWithMatcher:grey_notNil()];
 
   // Make server respond so URL1 becomes committed.
   [self setServerPaused:NO];
-  [[EarlGrey selectElementWithMatcher:webViewContainingText(kTestPage1)]
+  [[EarlGrey selectElementWithMatcher:WebViewContainingText(kTestPage1)]
       assertWithMatcher:grey_notNil()];
-  [[EarlGrey selectElementWithMatcher:omniboxText(_testURL1.GetContent())]
+  [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL1.GetContent())]
       assertWithMatcher:grey_notNil()];
 }
 
 // Tests that visible URL is always the same as last committed URL during
 // renderer-initiated navigation started with pending back navigation in
 // progress.
 - (void)testRendererInitiatedNavigationWithPendingBackNavigation {
   if (!experimental_flags::IsPendingIndexNavigationEnabled()) {
     EARL_GREY_TEST_SKIPPED(@"Pending Index Navigation experiment is disabled");
   }
 
   // Purge web view caches and pause the server to make sure that tests can
   // verify omnibox state before server starts responding.
   PurgeCachedWebViewPages();
   [self setServerPaused:YES];
 
   // Tap the back button in the toolbar and verify that URL2 (committed URL) is
   // displayed even though URL1 is a pending URL.
-  [[EarlGrey selectElementWithMatcher:chrome_test_util::backButton()]
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::BackButton()]
       performAction:grey_tap()];
   GREYAssert([self waitForServerToReceiveRequestWithURL:_testURL1],
              @"Last request URL: %@", self.lastRequestURLSpec);
-  [[EarlGrey selectElementWithMatcher:omniboxText(_testURL2.GetContent())]
+  [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL2.GetContent())]
       assertWithMatcher:grey_notNil()];
 
   // Interrupt back navigation with renderer initiated navigation.
   [ChromeEarlGrey tapWebViewElementWithID:base::SysUTF8ToNSString(kPage3Link)];
-  [[EarlGrey selectElementWithMatcher:omniboxText(_testURL2.GetContent())]
+  [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL2.GetContent())]
       assertWithMatcher:grey_notNil()];
 
   // Make server respond so URL1 becomes committed.
   [self setServerPaused:NO];
-  [[EarlGrey selectElementWithMatcher:webViewContainingText(kTestPage3)]
+  [[EarlGrey selectElementWithMatcher:WebViewContainingText(kTestPage3)]
       assertWithMatcher:grey_notNil()];
-  [[EarlGrey selectElementWithMatcher:omniboxText(_testURL3.GetContent())]
+  [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL3.GetContent())]
       assertWithMatcher:grey_notNil()];
 }
 
 // Tests that visible URL is always the same as last committed URL if user
 // issues 2 go back commands.
 - (void)testDoubleBackNavigation {
   if (!experimental_flags::IsPendingIndexNavigationEnabled()) {
     EARL_GREY_TEST_SKIPPED(@"Pending Index Navigation experiment is disabled");
   }
 
   // Create 3rd entry in the history, to be able to go back twice.
   [ChromeEarlGrey loadURL:_testURL3];
 
   // Purge web view caches and pause the server to make sure that tests can
   // verify omnibox state before server starts responding.
   PurgeCachedWebViewPages();
   [self setServerPaused:YES];
 
   // Tap the back button twice in the toolbar and verify that URL3 (committed
   // URL) is displayed even though URL1 is a pending URL.
-  [[EarlGrey selectElementWithMatcher:chrome_test_util::backButton()]
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::BackButton()]
       performAction:grey_tap()];
-  [[EarlGrey selectElementWithMatcher:chrome_test_util::backButton()]
+  [[EarlGrey selectElementWithMatcher:chrome_test_util::BackButton()]
       performAction:grey_tap()];
   // Server will receive only one request either for |_testURL2| or for
   // |_testURL1| depending on load timing and then will pause. So there is no
   // need to wait for particular request.
-  [[EarlGrey selectElementWithMatcher:omniboxText(_testURL3.GetContent())]
+  [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL3.GetContent())]
       assertWithMatcher:grey_notNil()];
 
   // Make server respond so URL1 becomes committed.
   [self setServerPaused:NO];
-  [[EarlGrey selectElementWithMatcher:webViewContainingText(kTestPage1)]
+  [[EarlGrey selectElementWithMatcher:WebViewContainingText(kTestPage1)]
       assertWithMatcher:grey_notNil()];
-  [[EarlGrey selectElementWithMatcher:omniboxText(_testURL1.GetContent())]
+  [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL1.GetContent())]
       assertWithMatcher:grey_notNil()];
 }
 
 // Tests that visible URL is always the same as last committed URL if page calls
 // window.history.back() twice.
 - (void)testDoubleBackJSNavigation {
   if (!experimental_flags::IsPendingIndexNavigationEnabled()) {
     EARL_GREY_TEST_SKIPPED(@"Pending Index Navigation experiment is disabled");
   }
 
   // Create 3rd entry in the history, to be able to go back twice.
   [ChromeEarlGrey loadURL:_testURL3];
 
   // Purge web view caches and pause the server to make sure that tests can
   // verify omnibox state before server starts responding.
   PurgeCachedWebViewPages();
   [self setServerPaused:YES];
 
   // Tap the back button twice on the page and verify that URL3 (committed URL)
   // is displayed even though URL1 is a pending URL.
   [ChromeEarlGrey tapWebViewElementWithID:base::SysUTF8ToNSString(kGoBackLink)];
   [ChromeEarlGrey tapWebViewElementWithID:base::SysUTF8ToNSString(kGoBackLink)];
   // Server will receive only one request either for |_testURL2| or for
   // |_testURL1| depending on load timing and then will pause. So there is no
   // need to wait for particular request.
-  [[EarlGrey selectElementWithMatcher:omniboxText(_testURL3.GetContent())]
+  [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL3.GetContent())]
       assertWithMatcher:grey_notNil()];
 
   // Make server respond so URL1 becomes committed.
   [self setServerPaused:NO];
-  [[EarlGrey selectElementWithMatcher:webViewContainingText(kTestPage1)]
+  [[EarlGrey selectElementWithMatcher:WebViewContainingText(kTestPage1)]
       assertWithMatcher:grey_notNil()];
-  [[EarlGrey selectElementWithMatcher:omniboxText(_testURL1.GetContent())]
+  [[EarlGrey selectElementWithMatcher:OmniboxText(_testURL1.GetContent())]
       assertWithMatcher:grey_notNil()];
 }
 
 #pragma mark -
 #pragma mark Private
 
 - (NSString*)lastRequestURLSpec {
   return base::SysUTF8ToNSString(_responseProvider->last_request_url().spec());
 }
 
@@ skipping 12 matching lines @@
 - (BOOL)waitForServerToReceiveRequestWithURL:(GURL)URL {
   return [[GREYCondition
       conditionWithName:@"Wait for received request"
                   block:^{
                     return _responseProvider->last_request_url() == URL ? YES
                                                                         : NO;
                   }] waitWithTimeout:10];
 }
 
 @end