Revert of Moved NavigationManagerImpl serialization out of CRWSessionController.

ios/web/web_state/web_state_impl.mm

 // 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.
 
 #import "ios/web/web_state/web_state_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/sys_string_conversions.h"
 #import "ios/web/interstitials/web_interstitial_impl.h"
 #import "ios/web/navigation/crw_session_controller.h"
 #import "ios/web/navigation/crw_session_entry.h"
 #import "ios/web/navigation/navigation_item_impl.h"
-#import "ios/web/navigation/navigation_manager_storage_builder.h"
 #include "ios/web/public/browser_state.h"
-#import "ios/web/public/crw_navigation_manager_storage.h"
 #import "ios/web/public/image_fetcher/image_data_fetcher.h"
 #import "ios/web/public/java_script_dialog_presenter.h"
 #import "ios/web/public/navigation_item.h"
 #include "ios/web/public/url_util.h"
 #import "ios/web/public/web_client.h"
 #import "ios/web/public/web_state/context_menu_params.h"
 #include "ios/web/public/web_state/credential.h"
 #import "ios/web/public/web_state/ui/crw_content_view.h"
 #import "ios/web/public/web_state/web_state_delegate.h"
 #include "ios/web/public/web_state/web_state_observer.h"
@@ skipping 13 matching lines @@
 #include "skia/ext/skia_utils_ios.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace web {
 
 /* static */
 std::unique_ptr<WebState> WebState::Create(const CreateParams& params) {
   std::unique_ptr<WebStateImpl> web_state(
       new WebStateImpl(params.browser_state));
 
-  // Initialized the new session.
   NSString* window_name = nil;
   NSString* opener_id = nil;
   BOOL opened_by_dom = NO;
   int opener_navigation_index = 0;
   web_state->GetNavigationManagerImpl().InitializeSession(
       window_name, opener_id, opened_by_dom, opener_navigation_index);
 
   // This std::move is required to compile with the version of clang shipping
   // with Xcode 8.0+. Evalute whether the issue is fixed once a new version of
   // Xcode is released.
   return std::move(web_state);
 }
 
-/* static */
-std::unique_ptr<WebState> WebState::Create(
-    const CreateParams& params,
-    CRWNavigationManagerStorage* session_storage) {
-  std::unique_ptr<WebStateImpl> web_state(
-      new WebStateImpl(params.browser_state, session_storage));
-
-  // This std::move is required to compile with the version of clang shipping
-  // with Xcode 8.0+. Evalute whether the issue is fixed once a new version of
-  // Xcode is released.
-  return std::move(web_state);
-}
-
 WebStateImpl::WebStateImpl(BrowserState* browser_state)
-    : WebStateImpl(browser_state, nullptr) {}
-
-WebStateImpl::WebStateImpl(BrowserState* browser_state,
-                           CRWNavigationManagerStorage* session_storage)
     : delegate_(nullptr),
       is_loading_(false),
       is_being_destroyed_(false),
       facade_delegate_(nullptr),
       web_controller_(nil),
+      navigation_manager_(this, browser_state),
       interstitial_(nullptr),
       weak_factory_(this) {
-  // Create or deserialize the NavigationManager.
-  if (session_storage) {
-    NavigationManagerStorageBuilder session_storage_builder;
-    navigation_manager_ =
-        session_storage_builder.BuildNavigationManagerImpl(session_storage);
-  } else {
-    navigation_manager_.reset(new NavigationManagerImpl());
-  }
-  navigation_manager_->SetDelegate(this);
-  navigation_manager_->SetBrowserState(browser_state);
-  // Send creation event and create the web controller.
   GlobalWebStateEventTracker::GetInstance()->OnWebStateCreated(this);
   web_controller_.reset([[CRWWebController alloc] initWithWebState:this]);
-  // Set up the image fetcher.
   image_fetcher_ =
       base::MakeUnique<ImageDataFetcher>(web::WebThread::GetBlockingPool());
   image_fetcher_->SetRequestContextGetter(browser_state->GetRequestContext());
 }
 
 WebStateImpl::~WebStateImpl() {
   [web_controller_ close];
   is_being_destroyed_ = true;
 
   // WebUI depends on web state so it must be destroyed first in case any WebUI
@@ skipping 71 matching lines @@
 }
 
 WebStateFacadeDelegate* WebStateImpl::GetFacadeDelegate() const {
   return facade_delegate_;
 }
 
 void WebStateImpl::SetFacadeDelegate(WebStateFacadeDelegate* facade_delegate) {
   facade_delegate_ = facade_delegate;
 }
 
+WebStateImpl* WebStateImpl::CopyForSessionWindow() {
+  WebStateImpl* copy = new WebStateImpl(GetBrowserState());
+  copy->GetNavigationManagerImpl().CopyState(&navigation_manager_);
+  return copy;
+}
+
 void WebStateImpl::OnNavigationCommitted(const GURL& url) {
   UpdateHttpResponseHeaders(url);
 }
 
 void WebStateImpl::OnUrlHashChanged() {
   for (auto& observer : observers_)
     observer.UrlHashChanged();
 }
 
 void WebStateImpl::OnHistoryStateChanged() {
@@ skipping 120 matching lines @@
     observer.SignInFailed(request_id, source_url);
 }
 
 void WebStateImpl::OnDocumentSubmitted(const std::string& form_name,
                                        bool user_initiated) {
   for (auto& observer : observers_)
     observer.DocumentSubmitted(form_name, user_initiated);
 }
 
 NavigationManagerImpl& WebStateImpl::GetNavigationManagerImpl() {
-  return *navigation_manager_;
+  return navigation_manager_;
 }
 
 const NavigationManagerImpl& WebStateImpl::GetNavigationManagerImpl() const {
-  return *navigation_manager_;
+  return navigation_manager_;
 }
 
 void WebStateImpl::CreateWebUI(const GURL& url) {
   web_ui_ = CreateWebUIIOS(url);
 }
 
 void WebStateImpl::ClearWebUI() {
   web_ui_.reset();
 }
 
@@ skipping 11 matching lines @@
 void WebStateImpl::LoadWebUIHtml(const base::string16& html, const GURL& url) {
   CHECK(web::GetWebClient()->IsAppSpecificURL(url));
   [web_controller_ loadHTML:base::SysUTF16ToNSString(html)
           forAppSpecificURL:url];
 }
 
 const base::string16& WebStateImpl::GetTitle() const {
   // TODO(stuartmorgan): Implement the NavigationManager logic necessary to
   // match the WebContents implementation of this method.
   DCHECK(Configured());
-  web::NavigationItem* item = navigation_manager_->GetLastCommittedItem();
+  web::NavigationItem* item = navigation_manager_.GetLastCommittedItem();
   return item ? item->GetTitleForDisplay() : empty_string16_;
 }
 
 void WebStateImpl::ShowTransientContentView(CRWContentView* content_view) {
   DCHECK(Configured());
   DCHECK(content_view);
   DCHECK(content_view.scrollView);
   [web_controller_ showTransientContentView:content_view];
 }
 
@@ skipping 239 matching lines @@
 
 void WebStateImpl::SetShouldSuppressDialogs(bool should_suppress) {
   [web_controller_ setShouldSuppressDialogs:should_suppress];
 }
 
 UIView* WebStateImpl::GetView() {
   return [web_controller_ view];
 }
 
 BrowserState* WebStateImpl::GetBrowserState() const {
-  return navigation_manager_->GetBrowserState();
+  return navigation_manager_.GetBrowserState();
 }
 
 void WebStateImpl::OpenURL(const WebState::OpenURLParams& params) {
   DCHECK(Configured());
   ClearTransientContentView();
   if (delegate_)
     delegate_->OpenURLFromWebState(this, params);
 }
 
 void WebStateImpl::Stop() {
   [web_controller_ stopLoading];
 }
 
 const NavigationManager* WebStateImpl::GetNavigationManager() const {
   return &GetNavigationManagerImpl();
 }
 
 NavigationManager* WebStateImpl::GetNavigationManager() {
   return &GetNavigationManagerImpl();
 }
 
-CRWNavigationManagerStorage* WebStateImpl::BuildSerializedNavigationManager() {
-  NavigationManagerStorageBuilder session_storage_builder;
-  return session_storage_builder.BuildSerialization(navigation_manager_.get());
-}
-
 CRWJSInjectionReceiver* WebStateImpl::GetJSInjectionReceiver() const {
   return [web_controller_ jsInjectionReceiver];
 }
 
 void WebStateImpl::ExecuteJavaScript(const base::string16& javascript) {
   [web_controller_ executeJavaScript:base::SysUTF16ToNSString(javascript)
                    completionHandler:nil];
 }
 
 void WebStateImpl::ExecuteJavaScript(const base::string16& javascript,
@@ skipping 17 matching lines @@
 
 const std::string& WebStateImpl::GetContentsMimeType() const {
   return mime_type_;
 }
 
 bool WebStateImpl::ContentIsHTML() const {
   return [web_controller_ contentIsHTML];
 }
 
 const GURL& WebStateImpl::GetVisibleURL() const {
-  web::NavigationItem* item = navigation_manager_->GetVisibleItem();
+  web::NavigationItem* item = navigation_manager_.GetVisibleItem();
   return item ? item->GetVirtualURL() : GURL::EmptyGURL();
 }
 
 const GURL& WebStateImpl::GetLastCommittedURL() const {
-  web::NavigationItem* item = navigation_manager_->GetLastCommittedItem();
+  web::NavigationItem* item = navigation_manager_.GetLastCommittedItem();
   return item ? item->GetVirtualURL() : GURL::EmptyGURL();
 }
 
 GURL WebStateImpl::GetCurrentURL(URLVerificationTrustLevel* trust_level) const {
   GURL URL = [web_controller_ currentURLWithTrustLevel:trust_level];
   bool equalURLs = web::GURLByRemovingRefFromGURL(URL) ==
                    web::GURLByRemovingRefFromGURL(GetLastCommittedURL());
   DCHECK(equalURLs);
   UMA_HISTOGRAM_BOOLEAN("Web.CurrentURLEqualsLastCommittedURL", equalURLs);
   return URL;
@@ skipping 50 matching lines @@
     const LoadCommittedDetails& load_details) {
   for (auto& observer : observers_)
     observer.NavigationItemCommitted(load_details);
 }
 
 WebState* WebStateImpl::GetWebState() {
   return this;
 }
 
 }  // namespace web