Moved serialization out of CRWSessionEntry.

ios/web/navigation/navigation_item_impl.h

 // Copyright 2014 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.
 
 #ifndef IOS_WEB_NAVIGATION_NAVIGATION_ITEM_IMPL_H_
 #define IOS_WEB_NAVIGATION_NAVIGATION_ITEM_IMPL_H_
 
 #import <Foundation/Foundation.h>
 
 #include <memory>
 
 #import "base/mac/scoped_nsobject.h"
 #include "base/strings/string16.h"
 #include "ios/web/navigation/navigation_item_facade_delegate.h"
 #include "ios/web/public/favicon_status.h"
 #import "ios/web/public/navigation_item.h"
 #include "ios/web/public/referrer.h"
 #include "ios/web/public/ssl_status.h"
 #include "url/gurl.h"
 
 namespace web {
 
 class NavigationItemFacadeDelegate;
+class NavigationItemStorageBuilder;
 
 // Implementation of NavigationItem.
 class NavigationItemImpl : public web::NavigationItem {
  public:
   // Creates a default NavigationItemImpl.
   NavigationItemImpl();
   ~NavigationItemImpl() override;
 
   // Since NavigationItemImpls own their facade delegates, there is no implicit
   // copy constructor (scoped_ptrs can't be copied), so one is defined here.
@@ skipping 100 matching lines @@
   bool is_overriding_user_agent_;
   base::scoped_nsobject<NSMutableDictionary> http_request_headers_;
 
   base::scoped_nsobject<NSString> serialized_state_object_;
   bool is_created_from_push_state_;
   bool has_state_been_replaced_;
   bool is_created_from_hash_change_;
   bool should_skip_repost_form_confirmation_;
   base::scoped_nsobject<NSData> post_data_;
 
+  // The NavigationManItemStorageBuilder functions require access to
+  // private variables of NavigationItemImpl.
+  friend NavigationItemStorageBuilder;

[Eugene But (OOO till 7-30), 2017/01/31 22:12:26]

nit: Do you want to move this to the top (before all ivars)?

[kkhorimoto, 2017/02/03 00:36:09]

Done.

+
   // Whether the item, while loading, was created for a renderer-initiated
   // navigation.  This dictates whether the URL should be displayed before the
   // navigation commits.  It is cleared in |ResetForCommit| and not persisted.
   bool is_renderer_initiated_;
 
   // Whether the navigation contains unsafe resources.
   bool is_unsafe_;
 
   // This is a cached version of the result of GetTitleForDisplay. When the URL,
   // virtual URL, or title is set, this should be cleared to force a refresh.
   mutable base::string16 cached_display_title_;
 
   // Weak pointer to the facade delegate.
   std::unique_ptr<NavigationItemFacadeDelegate> facade_delegate_;
 
   // Copy and assignment is explicitly allowed for this class.
 };
 
 }  // namespace web
 
 #endif  // IOS_WEB_NAVIGATION_NAVIGATION_ITEM_IMPL_H_