Updated tab history classes to use NavigationItemLists.

ios/chrome/browser/ui/history/tab_history_popup_controller_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/strings/sys_string_conversions.h"
 #include "components/strings/grit/components_strings.h"
+#include "components/url_formatter/url_formatter.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/web/public/test/http_server.h"
 #import "ios/web/public/test/http_server_util.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
+namespace {
+// Formats |url| for display and returns an NSString representation.
+NSString* GetFormattedURLString(const GURL& url) {
+  return base::SysUTF16ToNSString(url_formatter::FormatUrl(url));
+}
+}
+
 // Tests for tab history popup.
 @interface TabHistoryPopupControllerTestCase : ChromeTestCase
 @end
 
 @implementation TabHistoryPopupControllerTestCase
 
 // Test that the tab history back and forward menus contain the expected entries
 // for a series of navigations, and that tapping entries performs the
 // appropriate navigation.
 - (void)testTabHistoryMenu {
   const GURL URL1 = web::test::HttpServer::MakeUrl("http://page1");
   const GURL URL2 = web::test::HttpServer::MakeUrl("http://page2");
   const GURL URL3 = web::test::HttpServer::MakeUrl("http://page3");
   const GURL URL4 = web::test::HttpServer::MakeUrl("http://page4");
   NSString* entry0 = @"New Tab";
-  NSString* entry1 = base::SysUTF8ToNSString(URL1.spec());
-  NSString* entry2 = base::SysUTF8ToNSString(URL2.spec());
-  NSString* entry3 = base::SysUTF8ToNSString(URL3.spec());
-  NSString* entry4 = base::SysUTF8ToNSString(URL4.spec());
+  NSString* entry1 = GetFormattedURLString(URL1);
+  NSString* entry2 = GetFormattedURLString(URL2);
+  NSString* entry3 = GetFormattedURLString(URL3);
+  NSString* entry4 = GetFormattedURLString(URL4);
 
   // Create map of canned responses and set up the test HTML server.
   std::map<GURL, std::string> responses;
   responses[URL1] = "page1";
   responses[URL2] = "page2";
   responses[URL3] = "page3";
   responses[URL4] = "page4";
   web::test::SetUpSimpleHttpServer(responses);
 
   // Load 4 pages.
@@ skipping 40 matching lines @@
       assertWithMatcher:grey_notNil()];
   // Tap entry to go forward 2 pages, and verify that entry 3 is loaded.
   [[EarlGrey selectElementWithMatcher:grey_text(entry3)]
       performAction:grey_tap()];
   [[EarlGrey
       selectElementWithMatcher:chrome_test_util::OmniboxText(URL3.GetContent())]
       assertWithMatcher:grey_notNil()];
 }
 
 @end