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

Unified Diff: ios/web/web_state/ui/crw_wk_navigation_states_unittest.mm

Issue 2845913003: Cleaned up unused methods from WebStateImpl and NavigationContextImpl. (Closed)
Patch Set: Fixed tests 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/web_state/ui/crw_web_controller.mm ('k') | ios/web/web_state/web_state_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/web_state/ui/crw_wk_navigation_states_unittest.mm
diff --git a/ios/web/web_state/ui/crw_wk_navigation_states_unittest.mm b/ios/web/web_state/ui/crw_wk_navigation_states_unittest.mm
index a2594fd920ab91ed60938c35f604831098f1b820..057b4bb3e1d65d3a10d5680812beaa5205eca287 100644
--- a/ios/web/web_state/ui/crw_wk_navigation_states_unittest.mm
+++ b/ios/web/web_state/ui/crw_wk_navigation_states_unittest.mm
@@ -69,14 +69,14 @@ TEST_F(CRWWKNavigationStatesTest, LastAddedNavigation) {
// navigation_3 is added later and hence the latest.
std::unique_ptr<web::NavigationContextImpl> context =
- NavigationContextImpl::CreateSameDocumentNavigationContext(
- nullptr /*web_state*/, GURL(kTestUrl1));
+ NavigationContextImpl::CreateNavigationContext(nullptr /*web_state*/,
+ GURL(kTestUrl1));
[states_ setContext:std::move(context) forNavigation:navigation3_];
EXPECT_EQ(navigation3_, [states_ lastAddedNavigation]);
EXPECT_EQ(WKNavigationState::NONE, [states_ lastAddedNavigationState]);
}
-// Tests |setContext:forNavigation:| and |contextForNavigaiton:| methods.
+// Tests |setContext:forNavigation:| and |contextForNavigation:| methods.
TEST_F(CRWWKNavigationStatesTest, Context) {
EXPECT_FALSE([states_ contextForNavigation:navigation1_]);
EXPECT_FALSE([states_ contextForNavigation:navigation2_]);
@@ -84,8 +84,9 @@ TEST_F(CRWWKNavigationStatesTest, Context) {
// Add first context.
std::unique_ptr<web::NavigationContextImpl> context1 =
- NavigationContextImpl::CreateSameDocumentNavigationContext(
- nullptr /*web_state*/, GURL(kTestUrl1));
+ NavigationContextImpl::CreateNavigationContext(nullptr /*web_state*/,
+ GURL(kTestUrl1));
+ context1->SetIsSameDocument(true);
[states_ setContext:std::move(context1) forNavigation:navigation1_];
EXPECT_FALSE([states_ contextForNavigation:navigation2_]);
EXPECT_FALSE([states_ contextForNavigation:navigation3_]);
@@ -97,9 +98,9 @@ TEST_F(CRWWKNavigationStatesTest, Context) {
// Replace existing context.
std::unique_ptr<web::NavigationContextImpl> context2 =
- NavigationContextImpl::CreateErrorPageNavigationContext(
- nullptr /*web_state*/, GURL(kTestUrl2),
- nullptr /* response_headers */);
+ NavigationContextImpl::CreateNavigationContext(nullptr /*web_state*/,
+ GURL(kTestUrl2));
+ context2->SetIsErrorPage(true);
[states_ setContext:std::move(context2) forNavigation:navigation1_];
EXPECT_FALSE([states_ contextForNavigation:navigation2_]);
EXPECT_FALSE([states_ contextForNavigation:navigation3_]);
« no previous file with comments | « ios/web/web_state/ui/crw_web_controller.mm ('k') | ios/web/web_state/web_state_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698