Make push_and_replace_state_navigation_egtest.mm compatible with EG2

This adds the file as an EG2 target and updates #includes.

Bug: 987646
Change-Id: I10ff2d45efc784f36f2a394bfd75289617a78e86
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1950851Reviewed-by: Eugene But <eugenebut@chromium.org>
Commit-Queue: Ali Juma <ajuma@chromium.org>
Cr-Commit-Position: refs/heads/master@{#721552}

ios/chrome/browser/web/BUILD.gn

@@ -451,6 +451,7 @@ source_set("eg2_tests") {
     "js_print_egtest.mm",
     "navigation_egtest.mm",
     "progress_indicator_egtest.mm",
+    "push_and_replace_state_navigation_egtest.mm",
     "restore_egtest.mm",
     "stop_loading_egtest.mm",
     "tab_order_egtest.mm",

ios/chrome/browser/web/push_and_replace_state_navigation_egtest.mm

@@ -2,17 +2,14 @@
 // 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 <XCTest/XCTest.h>
-
 #include "base/strings/sys_string_conversions.h"
 #include "components/strings/grit/components_strings.h"
-#include "ios/chrome/browser/ui/util/ui_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"
 #include "ios/net/url_test_util.h"
+#import "ios/testing/earl_grey/earl_grey_test.h"
 #import "ios/web/public/test/http_server/http_server.h"
 #include "ios/web/public/test/http_server/http_server_util.h"