[ios] Use +[ShellEarlGrey loadURL:] for page loading in EG tests.

ios/web/shell/test/redirect_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 "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 "ios/web/public/test/response_providers/html_response_provider_impl.h"
-#include "ios/web/shell/test/app/navigation_test_util.h"
 #import "ios/web/shell/test/earl_grey/shell_base_test_case.h"
+#import "ios/web/shell/test/earl_grey/shell_earl_grey.h"
 #import "ios/web/shell/test/earl_grey/shell_matchers.h"
 #include "net/http/http_status_code.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 using web::addressFieldText;
 using web::test::HttpServer;
 using web::webViewContainingText;
@@ skipping 20 matching lines @@
   responses[thirdRedirectURL] = HtmlResponseProviderImpl::GetRedirectResponse(
       destinationURL, net::HTTP_MOVED_PERMANENTLY);
   const char kFinalPageContent[] = "testMultipleRedirects complete";
   responses[destinationURL] =
       HtmlResponseProviderImpl::GetSimpleResponse(kFinalPageContent);
   std::unique_ptr<web::DataResponseProvider> provider(
       new HtmlResponseProvider(responses));
   web::test::SetUpHttpServer(std::move(provider));
 
   // Load first URL and expect destination URL to load.
-  web::shell_test_util::LoadUrl(firstRedirectURL);
+  [ShellEarlGrey loadURL:firstRedirectURL];
   [[EarlGrey selectElementWithMatcher:addressFieldText(destinationURL.spec())]
       assertWithMatcher:grey_notNil()];
   [[EarlGrey selectElementWithMatcher:webViewContainingText(kFinalPageContent)]
       assertWithMatcher:grey_notNil()];
 }
 
 // Tests simple 301 redirection.
 - (void)testRedirection301 {
   // Create map of canned responses and set up the test HTML server.
   std::map<GURL, HtmlResponseProviderImpl::Response> responses;
   const GURL firstRedirectURL = HttpServer::MakeUrl("http://firstRedirect/");
   const GURL destinationURL = HttpServer::MakeUrl("http://destination/");
 
   responses[firstRedirectURL] = HtmlResponseProviderImpl::GetRedirectResponse(
       destinationURL, net::HTTP_MOVED_PERMANENTLY);
   const char kFinalPageContent[] = "testRedirection301 complete";
   responses[destinationURL] =
       HtmlResponseProviderImpl::GetSimpleResponse(kFinalPageContent);
   std::unique_ptr<web::DataResponseProvider> provider(
       new HtmlResponseProvider(responses));
   web::test::SetUpHttpServer(std::move(provider));
 
   // Load first URL and expect destination URL to load.
-  web::shell_test_util::LoadUrl(firstRedirectURL);
+  [ShellEarlGrey loadURL:firstRedirectURL];
   [[EarlGrey selectElementWithMatcher:addressFieldText(destinationURL.spec())]
       assertWithMatcher:grey_notNil()];
   [[EarlGrey selectElementWithMatcher:webViewContainingText(kFinalPageContent)]
       assertWithMatcher:grey_notNil()];
 }
 
 // Tests simple 302 redirection.
 - (void)testRedirection302 {
   // Create map of canned responses and set up the test HTML server.
   std::map<GURL, HtmlResponseProviderImpl::Response> responses;
   const GURL firstRedirectURL = HttpServer::MakeUrl("http://firstRedirect/");
   const GURL destinationURL = HttpServer::MakeUrl("http://destination/");
 
   responses[firstRedirectURL] = HtmlResponseProviderImpl::GetRedirectResponse(
       destinationURL, net::HTTP_FOUND);
   const char kFinalPageContent[] = "testRedirection302 complete";
   responses[destinationURL] =
       HtmlResponseProviderImpl::GetSimpleResponse(kFinalPageContent);
   std::unique_ptr<web::DataResponseProvider> provider(
       new HtmlResponseProvider(responses));
   web::test::SetUpHttpServer(std::move(provider));
 
   // Load first URL and expect destination URL to load.
-  web::shell_test_util::LoadUrl(firstRedirectURL);
+  [ShellEarlGrey loadURL:firstRedirectURL];
   [[EarlGrey selectElementWithMatcher:addressFieldText(destinationURL.spec())]
       assertWithMatcher:grey_notNil()];
   [[EarlGrey selectElementWithMatcher:webViewContainingText(kFinalPageContent)]
       assertWithMatcher:grey_notNil()];
 }
 
 @end