Allow storing null navigations in CRWWKNavigationStates.

ios/web/web_state/ui/crw_wk_navigation_states.mm

Index: ios/web/web_state/ui/crw_wk_navigation_states.mm
diff --git a/ios/web/web_state/ui/crw_wk_navigation_states.mm b/ios/web/web_state/ui/crw_wk_navigation_states.mm
index 117a7ead22435698827df8dd6c50d1c30a8313e0..529a2f023261fe1b010f9f5ab0c05a8f704f09b7 100644
--- a/ios/web/web_state/ui/crw_wk_navigation_states.mm
+++ b/ios/web/web_state/ui/crw_wk_navigation_states.mm
@@ -83,7 +83,16 @@
 @interface CRWWKNavigationStates () {
   NSMapTable* _records;
   NSUInteger _lastStateIndex;
+  WKNavigation* _nullNavigation;
 }
+
+// Returns key to use for storing navigation in records table.
+- (id)keyForNavigation:(WKNavigation*)navigation;
+
+// Returns last added navigation and record.
+- (void)getLastAddedNavigation:(WKNavigation**)outNavigation
+                        record:(CRWWKNavigationsStateRecord**)outRecord;
+
 @end
 
 @implementation CRWWKNavigationStates
@@ -91,6 +100,7 @@
 - (instancetype)init {
   if ((self = [super init])) {
     _records = [NSMapTable weakToStrongObjectsMapTable];
+    _nullNavigation = static_cast<WKNavigation*>([NSNull null]);

[kkhorimoto, 2017/04/25 14:00:11]

Is reinterpret_cast more appropriate here? 

[Eugene But (OOO till 7-30), 2017/04/26 05:51:33]

This translates one Obc-C pointer type to another, so static_cast should be
fine.

   }
   return self;
 }
@@ -102,12 +112,8 @@
 
 - (void)setState:(web::WKNavigationState)state
     forNavigation:(WKNavigation*)navigation {
-  if (!navigation) {
-    // WKWebView may call WKNavigationDelegate callbacks with nil.
-    return;
-  }
-
-  CRWWKNavigationsStateRecord* record = [_records objectForKey:navigation];
+  id key = [self keyForNavigation:navigation];
+  CRWWKNavigationsStateRecord* record = [_records objectForKey:key];
   if (!record) {
     DCHECK(state == web::WKNavigationState::REQUESTED ||
            state == web::WKNavigationState::STARTED ||
@@ -121,26 +127,19 @@
         (record.state == state && state == web::WKNavigationState::REDIRECTED));
     record.state = state;
   }
-  [_records setObject:record forKey:navigation];
+  [_records setObject:record forKey:key];
 }
 
 - (void)removeNavigation:(WKNavigation*)navigation {
-  if (!navigation) {
-    // WKWebView may call WKNavigationDelegate callbacks with nil.
-    return;
-  }
-
-  DCHECK([_records objectForKey:navigation]);
-  [_records removeObjectForKey:navigation];
+  id key = [self keyForNavigation:navigation];
+  DCHECK([_records objectForKey:key]);
+  [_records removeObjectForKey:key];
 }
 
 - (void)setContext:(std::unique_ptr<web::NavigationContextImpl>)context
      forNavigation:(WKNavigation*)navigation {
-  if (!navigation) {
-    // WKWebView may call WKNavigationDelegate callbacks with nil.
-    return;
-  }
-  CRWWKNavigationsStateRecord* record = [_records objectForKey:navigation];
+  id key = [self keyForNavigation:navigation];
+  CRWWKNavigationsStateRecord* record = [_records objectForKey:key];
   if (!record) {
     record =
         [[CRWWKNavigationsStateRecord alloc] initWithContext:std::move(context)
@@ -148,38 +147,49 @@
   } else {
     [record setContext:std::move(context)];
   }
-  [_records setObject:record forKey:navigation];
+  [_records setObject:record forKey:key];
 }
 
 - (web::NavigationContextImpl*)contextForNavigation:(WKNavigation*)navigation {
-  if (!navigation) {
-    // WKWebView may call WKNavigationDelegate callbacks with nil.
-    return nullptr;
-  }
-  CRWWKNavigationsStateRecord* record = [_records objectForKey:navigation];
+  id key = [self keyForNavigation:navigation];
+  CRWWKNavigationsStateRecord* record = [_records objectForKey:key];
   return record.context;
 }
 
 - (WKNavigation*)lastAddedNavigation {
   WKNavigation* result = nil;
+  CRWWKNavigationsStateRecord* unused = nil;
+  [self getLastAddedNavigation:&result record:&unused];
+  return result;
+}
+
+- (web::WKNavigationState)lastAddedNavigationState {
+  CRWWKNavigationsStateRecord* result = nil;
+  WKNavigation* unused = nil;
+  [self getLastAddedNavigation:&unused record:&result];
+  return result.state;
+}
+
+- (id)keyForNavigation:(WKNavigation*)navigation {
+  return navigation ? navigation : _nullNavigation;
+}
+
+- (void)getLastAddedNavigation:(WKNavigation**)outNavigation
+                        record:(CRWWKNavigationsStateRecord**)outRecord {
   NSUInteger lastAddedIndex = 0;  // record indices start with 1.
   for (WKNavigation* navigation in _records) {
     CRWWKNavigationsStateRecord* record = [_records objectForKey:navigation];
     if (lastAddedIndex < record.index) {
-      result = navigation;
+      *outNavigation = navigation;
+      *outRecord = record;
       lastAddedIndex = record.index;
     }
   }
-  return result;
-}
 
-- (web::WKNavigationState)lastAddedNavigationState {
-  CRWWKNavigationsStateRecord* lastAddedRecord = nil;
-  WKNavigation* lastAddedNavigation = [self lastAddedNavigation];
-  if (lastAddedNavigation)
-    lastAddedRecord = [_records objectForKey:lastAddedNavigation];
-
-  return lastAddedRecord.state;
+  if (*outNavigation == _nullNavigation) {
+    // |_nullNavigation| is a key for storing null navigations.
+    *outNavigation = nil;
+  }
 }
 
 @end