Make EarlGrey matchers compliant with Chromium style.

ios/chrome/browser/ui/fullscreen_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 <UIKit/UIKit.h>
 #import <XCTest/XCTest.h>
 
 #include "base/ios/ios_util.h"
 #include "base/mac/bind_objc_block.h"
@@ skipping 16 matching lines @@
 #import "ios/web/public/test/response_providers/error_page_response_provider.h"
 #import "ios/web/public/test/web_view_interaction_test_util.h"
 #include "url/gurl.h"
 
 namespace {
 
 // TODO(crbug.com/638674): Move this to a shared location as it is a duplicate
 // of ios/web/shell/test/page_state_egtest.mm.
 // Returns a matcher for asserting that element's content offset matches the
 // given |offset|.
-id<GREYMatcher> contentOffset(CGPoint offset) {
+id<GREYMatcher> ContentOffset(CGPoint offset) {
   MatchesBlock matches = ^BOOL(UIScrollView* element) {
     return CGPointEqualToPoint([element contentOffset], offset);
   };
   DescribeToBlock describe = ^(id<GREYDescription> description) {
     [description appendText:@"contentOffset"];
   };
   return grey_allOf(
       grey_kindOfClass([UIScrollView class]),
       [[GREYElementMatcherBlock alloc] initWithMatchesBlock:matches
                                            descriptionBlock:describe],
       nil);
 }
 
 // Hides the toolbar by scrolling down.
 void HideToolbarUsingUI() {
   [[EarlGrey
-      selectElementWithMatcher:webViewScrollView(
+      selectElementWithMatcher:WebViewScrollView(
                                    chrome_test_util::GetCurrentWebState())]
       performAction:grey_swipeFastInDirection(kGREYDirectionUp)];
 }
 
 // Asserts that the current URL is the |expectedURL| one.
 void AssertURLIs(const GURL& expectedURL) {
   NSString* description = [NSString
       stringWithFormat:@"Timeout waiting for the url to be %@",
                        base::SysUTF8ToNSString(expectedURL.GetContent())];
 
   ConditionBlock condition = ^{
     NSError* error = nil;
-    [[EarlGrey selectElementWithMatcher:chrome_test_util::omniboxText(
+    [[EarlGrey selectElementWithMatcher:chrome_test_util::OmniboxText(
                                             expectedURL.GetContent())]
         assertWithMatcher:grey_notNil()
                     error:&error];
     return (error == nil);
   };
   GREYAssert(testing::WaitUntilConditionOrTimeout(1.0, condition), description);
 }
 
 // Asserts that the current web view containers contains |text|.
 void AssertStringIsPresentOnPage(const std::string& text) {
   id<GREYMatcher> response_matcher =
-      chrome_test_util::webViewContainingText(text);
+      chrome_test_util::WebViewContainingText(text);
   [[EarlGrey selectElementWithMatcher:response_matcher]
       assertWithMatcher:grey_notNil()];
 }
 
 }  // namespace
 
 #pragma mark - Tests
 
 // Fullscreens tests for Chrome.
 @interface FullscreenTestCase : ChromeTestCase
@@ skipping 10 matching lines @@
       "http://ios/testing/data/http_server_files/two_pages.pdf");
   [ChromeEarlGrey loadURL:URL];
 
   chrome_test_util::AssertToolbarVisible();
   // Initial y scroll position is -56 on iPhone and -95 on iPad, to make room
   // for the toolbar.
   // TODO(crbug.com/618887) Replace use of specific values when API which
   // generates these values is exposed.
   CGFloat yOffset = IsIPadIdiom() ? -95.0 : -56.0;
   [[EarlGrey
-      selectElementWithMatcher:web::webViewScrollView(
+      selectElementWithMatcher:web::WebViewScrollView(
                                    chrome_test_util::GetCurrentWebState())]
-      assertWithMatcher:contentOffset(CGPointMake(0, yOffset))];
+      assertWithMatcher:ContentOffset(CGPointMake(0, yOffset))];
 }
 
 // Verifies that the toolbar properly appears/disappears when scrolling up/down
 // on a PDF that is short in length and wide in width.
 - (void)testSmallWidePDFScroll {
   web::test::SetUpFileBasedHttpServer();
   GURL URL = web::test::HttpServer::MakeUrl(
       "http://ios/testing/data/http_server_files/single_page_wide.pdf");
   [ChromeEarlGrey loadURL:URL];
 
   // Test that the toolbar is still visible after a user swipes down.
   [[EarlGrey
-      selectElementWithMatcher:webViewScrollView(
+      selectElementWithMatcher:WebViewScrollView(
                                    chrome_test_util::GetCurrentWebState())]
       performAction:grey_swipeFastInDirection(kGREYDirectionDown)];
   chrome_test_util::AssertToolbarVisible();
 
   // Test that the toolbar is no longer visible after a user swipes up.
   HideToolbarUsingUI();
   chrome_test_util::AssertToolbarNotVisible();
 }
 
 // Verifies that the toolbar properly appears/disappears when scrolling up/down
 // on a PDF that is long in length and wide in width.
 - (void)testLongPDFScroll {
   web::test::SetUpFileBasedHttpServer();
   GURL URL = web::test::HttpServer::MakeUrl(
       "http://ios/testing/data/http_server_files/two_pages.pdf");
   [ChromeEarlGrey loadURL:URL];
 
   // Test that the toolbar is hidden after a user swipes up.
   HideToolbarUsingUI();
   chrome_test_util::AssertToolbarNotVisible();
 
   // Test that the toolbar is visible after a user swipes down.
   [[EarlGrey
-      selectElementWithMatcher:webViewScrollView(
+      selectElementWithMatcher:WebViewScrollView(
                                    chrome_test_util::GetCurrentWebState())]
       performAction:grey_swipeFastInDirection(kGREYDirectionDown)];
   chrome_test_util::AssertToolbarVisible();
 
   // Test that the toolbar is hidden after a user swipes up.
   HideToolbarUsingUI();
   chrome_test_util::AssertToolbarNotVisible();
 }
 
 // Tests that link clicks from a chrome:// to chrome:// link result in the
@@ skipping 25 matching lines @@
       }));
 
   GREYAssert(testing::WaitUntilConditionOrTimeout(1.0,
                                                   ^{
                                                     return finished;
                                                   }),
              @"JavaScript to hide the toolbar did not complete");
 
   // Scroll up to be sure the toolbar can be dismissed by scrolling down.
   [[EarlGrey
-      selectElementWithMatcher:webViewScrollView(
+      selectElementWithMatcher:WebViewScrollView(
                                    chrome_test_util::GetCurrentWebState())]
       performAction:grey_swipeFastInDirection(kGREYDirectionDown)];
 
   // Scroll to hide the UI.
   HideToolbarUsingUI();
   chrome_test_util::AssertToolbarNotVisible();
 
   // Test that the toolbar is visible when moving from one chrome:// link to
   // another chrome:// link.
   chrome_test_util::TapWebViewElementWithId("version");
   chrome_test_util::AssertToolbarVisible();
 }
 
 // Tests hiding and showing of the header with a user scroll on a long page.
 - (void)testHideHeaderUserScrollLongPage {
   std::map<GURL, std::string> responses;
   const GURL URL = web::test::HttpServer::MakeUrl("http://tallpage");
 
   // A page long enough to ensure that the toolbar goes away on scrolling.
   responses[URL] = "<p style='height:200em'>a</p><p>b</p>";
   web::test::SetUpSimpleHttpServer(responses);
 
   [ChromeEarlGrey loadURL:URL];
   chrome_test_util::AssertToolbarVisible();
   // Simulate a user scroll down.
   HideToolbarUsingUI();
   chrome_test_util::AssertToolbarNotVisible();
   // Simulate a user scroll up.
   [[EarlGrey
-      selectElementWithMatcher:webViewScrollView(
+      selectElementWithMatcher:WebViewScrollView(
                                    chrome_test_util::GetCurrentWebState())]
       performAction:grey_swipeFastInDirection(kGREYDirectionDown)];
   chrome_test_util::AssertToolbarVisible();
 }
 
 // Tests that reloading of a page shows the header even if it was not shown
 // previously.
 - (void)testShowHeaderOnReload {
   std::map<GURL, std::string> responses;
   const GURL URL = web::test::HttpServer::MakeUrl("http://origin");
@@ skipping 166 matching lines @@
   [ChromeEarlGrey loadURL:URL];
   HideToolbarUsingUI();
   chrome_test_util::AssertToolbarNotVisible();
 
   chrome_test_util::TapWebViewElementWithId("link");
   AssertURLIs(ErrorPageResponseProvider::GetDnsFailureUrl());
   chrome_test_util::AssertToolbarVisible();
 }
 
 @end