Commit 359ffe97 authored by Eugene But's avatar Eugene But Committed by Commit Bot

Return virtual_url_ from NavigationItemImpl::GetDescription().

This could be useful during debugging.

Bug: None
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: Idddc32b00128a46ae2db2cabbdc69a4ed5e2fcbe
Reviewed-on: https://chromium-review.googlesource.com/1050442
Commit-Queue: Eugene But <eugenebut@chromium.org>
Reviewed-by: default avatarDanyao Wang <danyao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557225}
parent 0ca6086c
...@@ -353,13 +353,15 @@ base::string16 NavigationItemImpl::GetDisplayTitleForURL(const GURL& url) { ...@@ -353,13 +353,15 @@ base::string16 NavigationItemImpl::GetDisplayTitleForURL(const GURL& url) {
NSString* NavigationItemImpl::GetDescription() const { NSString* NavigationItemImpl::GetDescription() const {
return [NSString return [NSString
stringWithFormat: stringWithFormat:
@"url:%s originalurl:%s referrer: %s title:%s transition:%d " @"url:%s virtual_url_:%s originalurl:%s referrer: %s title:%s "
@"transition:%d "
"displayState:%@ userAgentType:%s is_create_from_push_state: %@ " "displayState:%@ userAgentType:%s is_create_from_push_state: %@ "
"has_state_been_replaced: %@ is_created_from_hash_change: %@ " "has_state_been_replaced: %@ is_created_from_hash_change: %@ "
"navigation_initiation_type: %d", "navigation_initiation_type: %d",
url_.spec().c_str(), original_request_url_.spec().c_str(), url_.spec().c_str(), virtual_url_.spec().c_str(),
referrer_.url.spec().c_str(), base::UTF16ToUTF8(title_).c_str(), original_request_url_.spec().c_str(), referrer_.url.spec().c_str(),
transition_type_, page_display_state_.GetDescription(), base::UTF16ToUTF8(title_).c_str(), transition_type_,
page_display_state_.GetDescription(),
GetUserAgentTypeDescription(user_agent_type_).c_str(), GetUserAgentTypeDescription(user_agent_type_).c_str(),
is_created_from_push_state_ ? @"true" : @"false", is_created_from_push_state_ ? @"true" : @"false",
has_state_been_replaced_ ? @"true" : @"false", has_state_been_replaced_ ? @"true" : @"false",
......
...@@ -52,13 +52,17 @@ TEST_F(NavigationItemTest, Dummy) { ...@@ -52,13 +52,17 @@ TEST_F(NavigationItemTest, Dummy) {
// Tests that the debug description is as expected. // Tests that the debug description is as expected.
TEST_F(NavigationItemTest, Description) { TEST_F(NavigationItemTest, Description) {
item_->SetTitle(base::UTF8ToUTF16("Title")); item_->SetTitle(base::UTF8ToUTF16("Title"));
EXPECT_NSEQ(@"url:http://init.test/ originalurl:http://init.test/ referrer: " NSString* description = item_->GetDescription();
@"title:Title transition:2 displayState:{ scrollOffset:(nan, " EXPECT_TRUE([description containsString:@"url:http://init.test/"]);
@"nan), zoomScaleRange:(nan, nan), zoomScale:nan } " EXPECT_TRUE([description containsString:@"originalurl:http://init.test/"]);
@"userAgentType:MOBILE is_create_from_push_state: false " EXPECT_TRUE([description containsString:@"title:Title"]);
@"has_state_been_replaced: false is_created_from_hash_change: " EXPECT_TRUE([description containsString:@"transition:2"]);
@"false navigation_initiation_type: 0", EXPECT_TRUE([description containsString:@"userAgentType:MOBILE"]);
item_->GetDescription()); EXPECT_TRUE([description containsString:@"is_create_from_push_state: false"]);
EXPECT_TRUE([description containsString:@"has_state_been_replaced: false"]);
EXPECT_TRUE(
[description containsString:@"is_created_from_hash_change: false"]);
EXPECT_TRUE([description containsString:@"navigation_initiation_type: 0"]);
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment