Converted CRWSessionController to use NavigationItems.

ios/web/navigation/crw_session_entry.mm

 // Copyright 2012 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/crw_session_entry.h"
 
 #include <stdint.h>
 
 #include <memory>
 
@@ skipping 27 matching lines @@
 NSString* const kSessionEntryTimestampKey = @"timestamp";
 NSString* const kSessionEntryTitleKey = @"title";
 NSString* const kSessionEntryPOSTDataKey = @"POSTData";
 NSString* const kSessionEntryHTTPRequestHeadersKey = @"httpHeaders";
 NSString* const kSessionEntrySkipRepostFormConfirmationKey =
     @"skipResubmitDataConfirmation";
 NSString* const kSessionEntryUseDesktopUserAgentKey = @"useDesktopUserAgent";
 }
 
 @interface CRWSessionEntry () {
-  // The NavigationItemImpl corresponding to this CRWSessionEntry.
-  // TODO(stuartmorgan): Move ownership to NavigationManagerImpl.
-  std::unique_ptr<web::NavigationItemImpl> _navigationItem;
+  // The NavigationItem passed on initialization.
+  web::NavigationItemImpl* _item;
 }
 
 // Returns a readable description of |displayState|.
 + (NSString*)descriptionForPageDisplayState:
         (const web::PageDisplayState&)displayState;
 @end
 
 @implementation CRWSessionEntry
 
-- (instancetype)initWithNavigationItem:
-    (std::unique_ptr<web::NavigationItem>)item {
-  self = [super init];
-  if (self) {
-    _navigationItem.reset(
-        static_cast<web::NavigationItemImpl*>(item.release()));
+- (instancetype)initWithNavigationItem:(web::NavigationItemImpl*)item {
+  if ((self = [super init])) {
+    DCHECK(item);
+    _item = item;
   }
   return self;
 }
 
-// TODO(ios): Shall we overwrite EqualTo:?
+#pragma mark - Accessors
 
-- (instancetype)copyWithZone:(NSZone*)zone {
-  CRWSessionEntry* copy = [[[self class] alloc] init];
-  copy->_navigationItem.reset(
-      new web::NavigationItemImpl(*_navigationItem.get()));
-  return copy;
+- (web::NavigationItem*)navigationItem {
+  return _item;
 }
 
+- (web::NavigationItemImpl*)navigationItemImpl {
+  return _item;
+}
+
+#pragma mark - NSObject
+
 - (NSString*)description {
   return [NSString
       stringWithFormat:
           @"url:%@ originalurl:%@ title:%@ transition:%d displayState:%@ "
           @"desktopUA:%d",
-          base::SysUTF8ToNSString(_navigationItem->GetURL().spec()),
-          base::SysUTF8ToNSString(
-              _navigationItem->GetOriginalRequestURL().spec()),
-          base::SysUTF16ToNSString(_navigationItem->GetTitle()),
-          _navigationItem->GetTransitionType(),
+          base::SysUTF8ToNSString(_item->GetURL().spec()),
+          base::SysUTF8ToNSString(_item->GetOriginalRequestURL().spec()),
+          base::SysUTF16ToNSString(_item->GetTitle()),
+          _item->GetTransitionType(),
           [[self class]
-              descriptionForPageDisplayState:_navigationItem
-                                                 ->GetPageDisplayState()],
-          _navigationItem->IsOverridingUserAgent()];
-}
-
-- (web::NavigationItem*)navigationItem {
-  return _navigationItem.get();
-}
-
-- (web::NavigationItemImpl*)navigationItemImpl {
-  return _navigationItem.get();
+              descriptionForPageDisplayState:_item->GetPageDisplayState()],
+          _item->IsOverridingUserAgent()];
 }
 
 #pragma mark -
 
 + (NSString*)descriptionForPageDisplayState:
         (const web::PageDisplayState&)displayState {
   NSString* const kPageScrollStateDescriptionFormat =
       @"{ scrollOffset:(%0.2f, %0.2f), zoomScaleRange:(%0.2f, %0.2f), "
       @"zoomScale:%0.2f }";
   return
       [NSString stringWithFormat:kPageScrollStateDescriptionFormat,
                                  displayState.scroll_state().offset_x(),
                                  displayState.scroll_state().offset_y(),
                                  displayState.zoom_state().minimum_zoom_scale(),
                                  displayState.zoom_state().maximum_zoom_scale(),
                                  displayState.zoom_state().zoom_scale()];
 }
 
 @end