Moved serialization out of CRWSessionEntry.

ios/chrome/browser/sessions/session_service.mm

Index: ios/chrome/browser/sessions/session_service.mm
diff --git a/ios/chrome/browser/sessions/session_service.mm b/ios/chrome/browser/sessions/session_service.mm
index 806b528ea39b0e31a7e00caa464400a39bf22342..4112e5ac3208f31d760cfa623d7265fa6c5b3da2 100644
--- a/ios/chrome/browser/sessions/session_service.mm
+++ b/ios/chrome/browser/sessions/session_service.mm
@@ -20,8 +20,7 @@
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #import "ios/chrome/browser/sessions/session_window.h"
 #import "ios/web/navigation/crw_session_certificate_policy_manager.h"
-#import "ios/web/navigation/crw_session_controller.h"
-#import "ios/web/navigation/crw_session_entry.h"
+#import "ios/web/public/crw_navigation_item_storage.h"
 #import "ios/web/public/crw_navigation_manager_storage.h"
 #include "ios/web/public/web_thread.h"
 
@@ -216,8 +215,10 @@ - (SessionWindowIOS*)loadWindowFromPath:(NSString*)path
                        forClassName:@"SessionController"];
   [SessionWindowUnarchiver setClass:[CRWNavigationManagerStorage class]
                        forClassName:@"CRWSessionController"];
-  [SessionWindowUnarchiver setClass:[CRWSessionEntry class]
+  [SessionWindowUnarchiver setClass:[CRWNavigationItemStorage class]
                        forClassName:@"SessionEntry"];
+  [SessionWindowUnarchiver setClass:[CRWNavigationItemStorage class]
+                       forClassName:@"CRWSessionEntry"];
   // TODO(crbug.com/661633): Remove this hack.
   [SessionWindowUnarchiver setClass:[SessionWindowIOS class]
                        forClassName:@"SessionWindow"];