Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(991)

Unified Diff: ios/chrome/browser/ui/history/tab_history_popup_controller_egtest.mm

Issue 2722983003: Reland Tab History and BrowserViewController CRWSessionEntry removal. (Closed)
Patch Set: TODO, early return Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ios/chrome/browser/ui/history/tab_history_popup_controller_egtest.mm
diff --git a/ios/chrome/browser/ui/history/tab_history_popup_controller_egtest.mm b/ios/chrome/browser/ui/history/tab_history_popup_controller_egtest.mm
index 1881fe8047aca2f67d18d3facb96dd8bf9bd924e..5ed4e78324ecccebf2f3dc1b12ffcac44c0bf8b8 100644
--- a/ios/chrome/browser/ui/history/tab_history_popup_controller_egtest.mm
+++ b/ios/chrome/browser/ui/history/tab_history_popup_controller_egtest.mm
@@ -11,6 +11,7 @@
#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"
+#include "ios/web/public/test/url_test_util.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
@@ -31,10 +32,10 @@ - (void)testTabHistoryMenu {
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 = base::SysUTF16ToNSString(web::GetDisplayTitleForUrl(URL1));
+ NSString* entry2 = base::SysUTF16ToNSString(web::GetDisplayTitleForUrl(URL2));
+ NSString* entry3 = base::SysUTF16ToNSString(web::GetDisplayTitleForUrl(URL3));
+ NSString* entry4 = base::SysUTF16ToNSString(web::GetDisplayTitleForUrl(URL4));
// Create map of canned responses and set up the test HTML server.
std::map<GURL, std::string> responses;

Powered by Google App Engine
This is Rietveld 408576698