Revert of Moved NavigationManagerImpl serialization out of CRWSessionController.

ios/web/navigation/navigation_manager_storage_builder.mm

Index: ios/web/navigation/navigation_manager_storage_builder.mm
diff --git a/ios/web/navigation/navigation_manager_storage_builder.mm b/ios/web/navigation/navigation_manager_storage_builder.mm
deleted file mode 100644
index 401dfdc58349d498f3202a9b58f264c6fe38943e..0000000000000000000000000000000000000000
--- a/ios/web/navigation/navigation_manager_storage_builder.mm
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2015 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/web/navigation/navigation_manager_storage_builder.h"
-
-#include "base/logging.h"
-#include "base/mac/foundation_util.h"
-#import "ios/web/navigation/crw_session_controller.h"
-#include "ios/web/navigation/navigation_manager_impl.h"
-#import "ios/web/public/crw_navigation_manager_storage.h"
-
-// CRWSessionController's readonly properties redefined as readwrite.  These
-// will be removed and NavigationManagerImpl's ivars will be written directly
-// as this functionality moves from CRWSessionController to
-// NavigationManagerImpl;
-@interface CRWSessionController (ExposedForSerialization)
-@property(nonatomic, readwrite, retain) NSString* tabId;
-@property(nonatomic, readwrite, copy) NSString* openerId;
-@property(nonatomic, readwrite, getter=isOpenedByDOM) BOOL openedByDOM;
-@property(nonatomic, readwrite, assign) NSInteger openerNavigationIndex;
-@property(nonatomic, readwrite, assign) NSInteger currentNavigationIndex;
-@property(nonatomic, readwrite, assign) NSInteger previousNavigationIndex;
-@property(nonatomic, readwrite, retain) NSArray* entries;
-@property(nonatomic, readwrite, retain)
-    CRWSessionCertificatePolicyManager* sessionCertificatePolicyManager;
-@end
-
-namespace web {
-
-CRWNavigationManagerStorage*
-NavigationManagerStorageBuilder::BuildSerialization(
-    NavigationManagerImpl* navigation_manager) const {
-  DCHECK(navigation_manager);
-  CRWNavigationManagerStorage* serialized_navigation_manager =
-      [[CRWNavigationManagerStorage alloc] init];
-  CRWSessionController* session_controller =
-      navigation_manager->GetSessionController();
-  serialized_navigation_manager.tabID = session_controller.tabId;
-  serialized_navigation_manager.openerID = session_controller.openerId;
-  serialized_navigation_manager.openedByDOM = session_controller.openedByDOM;
-  serialized_navigation_manager.openerNavigationIndex =
-      session_controller.openerNavigationIndex;
-  serialized_navigation_manager.windowName = session_controller.windowName;
-  serialized_navigation_manager.currentNavigationIndex =
-      session_controller.currentNavigationIndex;
-  serialized_navigation_manager.previousNavigationIndex =
-      session_controller.previousNavigationIndex;
-  serialized_navigation_manager.lastVisitedTimestamp =
-      session_controller.lastVisitedTimestamp;
-  serialized_navigation_manager.entries = session_controller.entries;
-  serialized_navigation_manager.sessionCertificatePolicyManager =
-      session_controller.sessionCertificatePolicyManager;
-  return serialized_navigation_manager;
-}
-
-std::unique_ptr<NavigationManagerImpl>
-NavigationManagerStorageBuilder::BuildNavigationManagerImpl(
-    CRWNavigationManagerStorage* navigation_manager_serialization) const {
-  DCHECK(navigation_manager_serialization);
-  base::scoped_nsobject<CRWSessionController> session_controller(
-      [[CRWSessionController alloc] init]);
-  [session_controller setTabId:navigation_manager_serialization.tabID];
-  [session_controller setOpenerId:navigation_manager_serialization.openerID];
-  [session_controller
-      setOpenedByDOM:navigation_manager_serialization.openedByDOM];
-  [session_controller setOpenerNavigationIndex:navigation_manager_serialization
-                                                   .openerNavigationIndex];
-  [session_controller
-      setWindowName:navigation_manager_serialization.windowName];
-  [session_controller setCurrentNavigationIndex:navigation_manager_serialization
-                                                    .currentNavigationIndex];
-  [session_controller
-      setPreviousNavigationIndex:navigation_manager_serialization
-                                     .previousNavigationIndex];
-  [session_controller setLastVisitedTimestamp:navigation_manager_serialization
-                                                  .lastVisitedTimestamp];
-  [session_controller setEntries:navigation_manager_serialization.entries];
-  [session_controller
-      setSessionCertificatePolicyManager:navigation_manager_serialization
-                                             .sessionCertificatePolicyManager];
-  std::unique_ptr<NavigationManagerImpl> navigation_manager(
-      new NavigationManagerImpl());
-  navigation_manager->SetSessionController(session_controller);
-  return navigation_manager;
-}
-
-}  // namespace web