Reland Tab History and BrowserViewController CRWSessionEntry removal.

ios/chrome/browser/web/forms_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 <XCTest/XCTest.h>
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/strings/grit/components_strings.h"
 #import "ios/chrome/browser/ui/commands/generic_chrome_command.h"
 #include "ios/chrome/browser/ui/commands/ios_command_ids.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #import "ios/chrome/test/app/chrome_test_util.h"
 #include "ios/chrome/test/app/navigation_test_util.h"
 #include "ios/chrome/test/app/web_view_interaction_test_util.h"
 #import "ios/chrome/test/earl_grey/chrome_earl_grey.h"
 #import "ios/chrome/test/earl_grey/chrome_matchers.h"
 #import "ios/chrome/test/earl_grey/chrome_test_case.h"
 #import "ios/testing/wait_util.h"
 #import "ios/web/public/test/http_server.h"
 #import "ios/web/public/test/http_server_util.h"
 #include "ios/web/public/test/response_providers/data_response_provider.h"
+#include "ios/web/public/test/url_test_util.h"
 
 namespace {
 
 // URL for a generic website in the user navigation flow.
 const char kGenericUrl[] = "http://generic";
 
 // URL to print the HTTP method and the request body.
 const char kPrintFormDataUrl[] = "http://printFormData";
 
 // URL that redirects to kPrintPostData with a 302.
@@ skipping 234 matching lines @@
 - (void)testRepostFormAfterIndexNavigation {
   [ChromeEarlGrey loadURL:TestResponseProvider::GetFormUrl()];
   [self submitForm];
 
   // Go to a new page.
   [ChromeEarlGrey loadURL:TestResponseProvider::GetGenericUrl()];
 
   [self openBackHistory];
   [self waitForTabHistoryView];
 
-  id<GREYMatcher> historyItem = grey_text(base::SysUTF8ToNSString(
-      TestResponseProvider::GetPrintFormDataUrl().spec()));
+  GURL history_url = TestResponseProvider::GetPrintFormDataUrl();
+  id<GREYMatcher> historyItem = grey_text(
+      base::SysUTF16ToNSString(web::GetDisplayTitleForUrl(history_url)));
   [[EarlGrey selectElementWithMatcher:historyItem] performAction:grey_tap()];
 
   [ChromeEarlGrey waitForPageToFinishLoading];
 
   [self confirmResendWarning];
   [self waitForExpectedResponse:kExpectedPostData];
 }
 
 // When data is not re-sent, the request is done with a GET method.
 - (void)testRepostFormCancelling {
@@ skipping 37 matching lines @@
   id<GREYMatcher> resendWarning =
       chrome_test_util::ButtonWithAccessibilityLabelId(
           IDS_HTTP_POST_WARNING_RESEND);
   [[EarlGrey selectElementWithMatcher:resendWarning]
       assertWithMatcher:grey_nil()];
 
   [self waitForExpectedResponse:"GET"];
 }
 
 @end