Revert of Moved NavigationManagerImpl serialization out of CRWSessionController.

ios/chrome/browser/sessions/session_service.mm

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/chrome/browser/sessions/session_service.h"
 
 #import <UIKit/UIKit.h>
 
 #include "base/files/file_path.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/mac/bind_objc_block.h"
 #include "base/mac/foundation_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/sequenced_task_runner.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/thread_restrictions.h"
 #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_manager_storage.h"
 #include "ios/web/public/web_thread.h"
 
 // When C++ exceptions are disabled, the C++ library defines |try| and
 // |catch| so as to allow exception-expecting C++ code to build properly when
 // language support for exceptions is not present.  These macros interfere
 // with the use of |@try| and |@catch| in Objective-C files such as this one.
 // Undefine these macros here, after everything has been #included, since
 // there will be no C++ uses and only Objective-C uses from this point on.
 #undef try
 #undef catch
@@ skipping 169 matching lines @@
                forBrowserState:browserState];
   return window;
 }
 
 - (SessionWindowIOS*)loadWindowFromPath:(NSString*)path
                         forBrowserState:(ios::ChromeBrowserState*)browserState {
   // HACK: Handle the case where we had to change the class name of a persisted
   // class on disk.
   [SessionWindowUnarchiver setClass:[CRWSessionCertificatePolicyManager class]
                        forClassName:@"SessionCertificatePolicyManager"];
-  [SessionWindowUnarchiver setClass:[CRWNavigationManagerStorage class]
+  [SessionWindowUnarchiver setClass:[CRWSessionController class]
                        forClassName:@"SessionController"];
-  [SessionWindowUnarchiver setClass:[CRWNavigationManagerStorage class]
-                       forClassName:@"CRWSessionController"];
   [SessionWindowUnarchiver setClass:[CRWSessionEntry class]
                        forClassName:@"SessionEntry"];
   // TODO(crbug.com/661633): Remove this hack.
   [SessionWindowUnarchiver setClass:[SessionWindowIOS class]
                        forClassName:@"SessionWindow"];
   SessionWindowIOS* window = nil;
   @try {
     NSData* data = [NSData dataWithContentsOfFile:path];
     if (data) {
       base::scoped_nsobject<SessionWindowUnarchiver> unarchiver([
@@ skipping 16 matching lines @@
         base::ThreadRestrictions::AssertIOAllowed();
         NSFileManager* fileManager = [NSFileManager defaultManager];
         if (![fileManager fileExistsAtPath:sessionFile])
           return;
         if (![fileManager removeItemAtPath:sessionFile error:nil])
           CHECK(false) << "Unable to delete session file.";
       }));
 }
 
 @end