Moved NavigationManagerImpl serialization out of CRWSessionController.

ios/web/web_state/web_state_impl.h

 // Copyright 2013 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_WEB_STATE_WEB_STATE_IMPL_H_
 #define IOS_WEB_WEB_STATE_WEB_STATE_IMPL_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 37 matching lines @@
 //      (a) By @Tab, when creating a new Tab.
 //      (b) By @SessionWindow, when decoding a saved session.
 //      (c) By the Copy() method, below, used when marshalling a session
 //          in preparation for saving.
 //  - WebControllers are the eventual long-term owners of WebStateImpls.
 //  - SessionWindows are transient owners, passing ownership into WebControllers
 //    during session restore, and discarding owned copies of WebStateImpls after
 //    writing them out for session saves.
 class WebStateImpl : public WebState, public NavigationManagerDelegate {
  public:
+  // Constructor for WebStateImpls created for new sessions.
   WebStateImpl(BrowserState* browser_state);
+  // Constructor for WebStatesImpls created for deserialized or copied
+  // NavigationManagerImpls.
+  WebStateImpl(BrowserState* browser_State,

[Eugene But (OOO till 7-30), 2015/09/23 16:33:44]

s/browser_State/browser_state/

[kkhorimoto, 2015/09/24 18:12:59]

Done.

+               scoped_ptr<NavigationManagerImpl> navigation_manager);
   ~WebStateImpl() override;
 
   // Sets the CRWWebController that backs this object. Typically
   // |web_controller| will also take ownership of this object. This will also
   // create the WebContentsIOS facade.
   void SetWebController(CRWWebController* web_controller);
 
   // Gets or sets the delegate used to communicate with the web contents facade.
   WebStateFacadeDelegate* GetFacadeDelegate() const;
   void SetFacadeDelegate(WebStateFacadeDelegate* facade_delegate);
 
   // Returns a WebStateImpl that doesn't have a browser context, web
   // controller, or facade set, but which otherwise has the same state variables
   // as the calling object (including copies of the NavigationManager and its
   // attendant CRWSessionController).
   // TODO(marq): Revisit this function and the ownership model described above;
   // too this depends on and interacts directly with above-the-web-level
   // information.
-  WebStateImpl* CopyForSessionWindow();
+  scoped_ptr<WebStateImpl> CopyForSerialization() const;
 
   // Notifies the observers that a provisional navigation has started.
   void OnProvisionalNavigationStarted(const GURL& url);
 
   // Notifies the observers that the URL hash of the current page changed.
   void OnUrlHashChanged();
 
   // Notifies the observers that the history state of the current page changed.
   void OnHistoryStateChanged();
 
@@ skipping 184 matching lines @@
 
   // Stores whether the web state is currently loading a page.
   bool is_loading_;
 
   // The delegate used to pass state to the web contents facade.
   WebStateFacadeDelegate* facade_delegate_;
 
   // The CRWWebController that backs and owns this object.
   CRWWebController* web_controller_;
 
-  NavigationManagerImpl navigation_manager_;
+  // The NavigationManagerImpl that stores session info for this WebStateImpl.
+  scoped_ptr<NavigationManagerImpl> navigation_manager_;
 
   // |web::WebUIIOS| object for the current page if it is a WebUI page that
   // uses the web-based WebUI framework, or nullptr otherwise.
   scoped_ptr<web::WebUIIOS> web_ui_;
 
   // A list of observers notified when page state changes. Weak references.
   base::ObserverList<WebStateObserver, true> observers_;
 
   // All the WebStatePolicyDeciders asked for navigation decision. Weak
   // references.
@@ skipping 30 matching lines @@
 
   // Callbacks associated to command prefixes.
   std::map<std::string, ScriptCommandCallback> script_command_callbacks_;
 
   DISALLOW_COPY_AND_ASSIGN(WebStateImpl);
 };
 
 }  // namespace web
 
 #endif  // IOS_WEB_WEB_STATE_WEB_STATE_IMPL_H_