| Index: ios/web/navigation/serialized_navigation_manager_builder.mm
|
| diff --git a/ios/web/navigation/serialized_navigation_manager_builder.mm b/ios/web/navigation/serialized_navigation_manager_builder.mm
|
| index 972e1432cc7802ee3174fe350f77ea705665e74d..20fbd8004e94c9d5577ac232076930b89a2711bb 100644
|
| --- a/ios/web/navigation/serialized_navigation_manager_builder.mm
|
| +++ b/ios/web/navigation/serialized_navigation_manager_builder.mm
|
| @@ -9,6 +9,7 @@
|
| #import "ios/web/navigation/crw_serialized_navigation_manager.h"
|
| #import "ios/web/navigation/crw_session_controller.h"
|
| #include "ios/web/navigation/navigation_manager_impl.h"
|
| +#include "ios/web/public/serialized_user_data_manager.h"
|
|
|
| // CRWSessionController's readonly properties redefined as readwrite. These
|
| // will be removed and NavigationManagerImpl's ivars will be written directly
|
| @@ -54,6 +55,12 @@ SerializedNavigationManagerBuilder::FromNavigationManager(
|
| session_controller.sessionCertificatePolicyManager;
|
| serialized_navigation_manager.XCallbackParameters =
|
| session_controller.xCallbackParameters;
|
| + web::SerializedUserDataManager* userDataManager =
|
| + web::SerializedUserDataManager::FromWebState(
|
| + navigation_manager->GetWebState());
|
| + serialized_navigation_manager.serializedUserData =
|
| + userDataManager->GetSerializationDictionary();
|
| +
|
| return serialized_navigation_manager;
|
| }
|
|
|
| @@ -84,6 +91,11 @@ SerializedNavigationManagerBuilder::ToNavigationManager(
|
| scoped_ptr<NavigationManagerImpl> navigation_manager(
|
| new NavigationManagerImpl());
|
| navigation_manager->SetSessionController(session_controller);
|
| + web::SerializedUserDataManager* userDataManager =
|
| + web::SerializedUserDataManager::FromWebState(
|
| + navigation_manager->GetWebState());
|
| + userDataManager->AddValuesFromDictionary(
|
| + serialized_navigation_manager.serializedUserData);
|
| return navigation_manager.Pass();
|
| }
|
|
|
|
|