Refactor web shell integration tests utilities.

ios/web/shell/test/web_shell_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 <UIKit/UIKit.h>
 #import <WebKit/WebKit.h>
 #import <XCTest/XCTest.h>
 
 #import <EarlGrey/EarlGrey.h>
 
 #include "base/strings/sys_string_conversions.h"
 #import "ios/web/public/test/http_server.h"
 #include "ios/web/public/test/http_server_util.h"
-#include "ios/web/shell/test/navigation_test_util.h"
-#import "ios/web/shell/test/shell_matchers.h"
-#import "ios/web/shell/test/web_view_matchers.h"
+#include "ios/web/public/test/navigation_test_util.h"
+#include "ios/web/shell/test/app/web_shell_test_util.h"
+#import "ios/web/shell/test/earl_grey/shell_matchers.h"
 
 // Navigation test cases for the web shell. These are Earl Grey integration
 // tests, which are based on XCTest.
 @interface CRWWebShellNavigationTest : XCTestCase
 
 @end
 
 @implementation CRWWebShellNavigationTest
 
 // Set up called once for the class.
@@ skipping 28 matching lines @@
   const GURL URL1 = web::test::HttpServer::MakeUrl("http://firstURL");
   NSString* response1 = @"Test Page 1";
   responses[URL1] = base::SysNSStringToUTF8(response1);
 
   const GURL URL2 = web::test::HttpServer::MakeUrl("http://secondURL");
   NSString* response2 = @"Test Page 2";
   responses[URL2] = base::SysNSStringToUTF8(response2);
 
   web::test::SetUpSimpleHttpServer(responses);
 
-  web::navigation_test_util::LoadUrl(URL1);
+  web::WebState* webState = web::web_shell_test_util::GetCurrentWebState();
+
+  web::navigation_test_util::LoadUrl(webState, URL1);
 
   [[EarlGrey selectElementWithMatcher:web::webViewContainingText(response1)]
       assertWithMatcher:grey_notNil()];
 
-  web::navigation_test_util::LoadUrl(URL2);
+  web::navigation_test_util::LoadUrl(webState, URL2);
 
   [[EarlGrey selectElementWithMatcher:web::webViewContainingText(response2)]
       assertWithMatcher:grey_notNil()];
 
   [[EarlGrey selectElementWithMatcher:web::backButton()]
       performAction:grey_tap()];
 
   [[EarlGrey selectElementWithMatcher:web::webViewContainingText(response1)]
       assertWithMatcher:grey_notNil()];
 
   [[EarlGrey selectElementWithMatcher:web::forwardButton()]
       performAction:grey_tap()];
 
   [[EarlGrey selectElementWithMatcher:web::webViewContainingText(response2)]
       assertWithMatcher:grey_notNil()];
 }
 
 @end