ios/web/public/test/fakes/test_web_state_observer.mm - Issue 2901633002: Replaced NavigationContext::IsErrorPage with NavigationContext::GetError

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ios/web/public/test/fakes/test_web_state_observer.mm

Issue 2901633002: Replaced NavigationContext::IsErrorPage with NavigationContext::GetError (Closed)

Patch Set: Created 3 years, 7 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

« no previous file with comments | « ios/web/public/test/fakes/crw_test_web_state_observer.mm ('k') | ios/web/public/test/fakes/test_web_state_observer_util.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/web/public/test/fakes/test_web_state_observer.mm

diff --git a/ios/web/public/test/fakes/test_web_state_observer.mm b/ios/web/public/test/fakes/test_web_state_observer.mm

index 9405d17ee05d698e7193836ebe3b5d5d390dcb81..5521fad1719d78fa10bb3c357080c95cac050140 100644

--- a/ios/web/public/test/fakes/test_web_state_observer.mm

+++ b/ios/web/public/test/fakes/test_web_state_observer.mm

@@ -5,7 +5,7 @@

#include "ios/web/public/test/fakes/test_web_state_observer.h"

#include "base/memory/ptr_util.h"

-#include "ios/web/public/web_state/navigation_context.h"

+#import "ios/web/public/web_state/navigation_context.h"

#include "ios/web/public/web_state/web_state.h"

#include "ios/web/web_state/navigation_context_impl.h"

#include "net/http/http_response_headers.h"

@@ -59,7 +59,7 @@ void TestWebStateObserver::NavigationItemChanged() {

}

void TestWebStateObserver::DidStartNavigation(NavigationContext* navigation) {

- ASSERT_TRUE(!navigation->IsErrorPage() || !navigation->IsSameDocument());

+ ASSERT_TRUE(!navigation->GetError() || !navigation->IsSameDocument());

did_start_navigation_info_ =

base::MakeUnique<web::TestDidStartNavigationInfo>();

did_start_navigation_info_->web_state = web_state();

@@ -67,12 +67,12 @@ void TestWebStateObserver::DidStartNavigation(NavigationContext* navigation) {

web::NavigationContextImpl::CreateNavigationContext(

navigation->GetWebState(), navigation->GetUrl());

context->SetIsSameDocument(navigation->IsSameDocument());

- context->SetIsErrorPage(navigation->IsErrorPage());

+ context->SetError(navigation->GetError());

did_start_navigation_info_->context = std::move(context);

}

void TestWebStateObserver::DidFinishNavigation(NavigationContext* navigation) {

- ASSERT_TRUE(!navigation->IsErrorPage() || !navigation->IsSameDocument());

+ ASSERT_TRUE(!navigation->GetError() || !navigation->IsSameDocument());

did_finish_navigation_info_ =

base::MakeUnique<web::TestDidFinishNavigationInfo>();

did_finish_navigation_info_->web_state = web_state();

@@ -80,7 +80,7 @@ void TestWebStateObserver::DidFinishNavigation(NavigationContext* navigation) {

web::NavigationContextImpl::CreateNavigationContext(

navigation->GetWebState(), navigation->GetUrl());

context->SetIsSameDocument(navigation->IsSameDocument());

- context->SetIsErrorPage(navigation->IsErrorPage());

+ context->SetError(navigation->GetError());

did_finish_navigation_info_->context = std::move(context);

}