Index: ios/web/public/test/fakes/crw_test_web_state_observer.mm |
diff --git a/ios/web/public/test/fakes/crw_test_web_state_observer.mm b/ios/web/public/test/fakes/crw_test_web_state_observer.mm |
index 36eb86f36d2490257f3d11949463b7fe0a47d412..51280fb46a3a8d6725367f3c2184f5cff300d8df 100644 |
--- a/ios/web/public/test/fakes/crw_test_web_state_observer.mm |
+++ b/ios/web/public/test/fakes/crw_test_web_state_observer.mm |
@@ -5,8 +5,8 @@ |
#import "ios/web/public/test/fakes/crw_test_web_state_observer.h" |
#include "base/memory/ptr_util.h" |
-#include "ios/web/public/web_state/navigation_context.h" |
-#include "ios/web/web_state/navigation_context_impl.h" |
+#import "ios/web/public/web_state/navigation_context.h" |
+#import "ios/web/web_state/navigation_context_impl.h" |
#include "net/http/http_response_headers.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -127,14 +127,14 @@ TestUpdateFaviconUrlCandidatesInfo::~TestUpdateFaviconUrlCandidatesInfo() = |
- (void)webState:(web::WebState*)webState |
didStartNavigation:(web::NavigationContext*)navigation { |
- ASSERT_TRUE(!navigation->IsErrorPage() || !navigation->IsSameDocument()); |
+ ASSERT_TRUE(!navigation->GetError() || !navigation->IsSameDocument()); |
_didStartNavigationInfo = base::MakeUnique<web::TestDidStartNavigationInfo>(); |
_didStartNavigationInfo->web_state = webState; |
std::unique_ptr<web::NavigationContextImpl> context = |
web::NavigationContextImpl::CreateNavigationContext( |
navigation->GetWebState(), navigation->GetUrl()); |
context->SetIsSameDocument(navigation->IsSameDocument()); |
- context->SetIsErrorPage(navigation->IsErrorPage()); |
+ context->SetError(navigation->GetError()); |
_didStartNavigationInfo->context = std::move(context); |
} |
@@ -148,7 +148,7 @@ TestUpdateFaviconUrlCandidatesInfo::~TestUpdateFaviconUrlCandidatesInfo() = |
- (void)webState:(web::WebState*)webState |
didFinishNavigation:(web::NavigationContext*)navigation { |
- ASSERT_TRUE(!navigation->IsErrorPage() || !navigation->IsSameDocument()); |
+ ASSERT_TRUE(!navigation->GetError() || !navigation->IsSameDocument()); |
_didFinishNavigationInfo = |
base::MakeUnique<web::TestDidFinishNavigationInfo>(); |
_didFinishNavigationInfo->web_state = webState; |
@@ -156,7 +156,7 @@ TestUpdateFaviconUrlCandidatesInfo::~TestUpdateFaviconUrlCandidatesInfo() = |
web::NavigationContextImpl::CreateNavigationContext( |
navigation->GetWebState(), navigation->GetUrl()); |
context->SetIsSameDocument(navigation->IsSameDocument()); |
- context->SetIsErrorPage(navigation->IsErrorPage()); |
+ context->SetError(navigation->GetError()); |
_didFinishNavigationInfo->context = std::move(context); |
} |