Converted CRWSessionController to use NavigationItems.

ios/web/navigation/crw_session_entry_unittest.mm

Index: ios/web/navigation/crw_session_entry_unittest.mm
diff --git a/ios/web/navigation/crw_session_entry_unittest.mm b/ios/web/navigation/crw_session_entry_unittest.mm
index ded434a0912b3a4318eb7686031742df4d692098..2fe6708fb3e79306dcb7d87b16bdf17b54194379 100644
--- a/ios/web/navigation/crw_session_entry_unittest.mm
+++ b/ios/web/navigation/crw_session_entry_unittest.mm
@@ -33,20 +33,19 @@ void SetUp() override {
     GURL url("http://init.test");
     ui::PageTransition transition =
         ui::PAGE_TRANSITION_AUTO_BOOKMARK;
-    std::unique_ptr<web::NavigationItemImpl> item(
-        new web::NavigationItemImpl());
-    item->SetOriginalRequestURL(url);
-    item->SetURL(url);
-    item->SetTransitionType(transition);
-    item->SetTimestamp(base::Time::Now());
-    item->SetPostData([@"Test data" dataUsingEncoding:NSUTF8StringEncoding]);
-    sessionEntry_.reset(
-        [[CRWSessionEntry alloc] initWithNavigationItem:std::move(item)]);
+    _item.reset(new web::NavigationItemImpl());
+    _item->SetOriginalRequestURL(url);
+    _item->SetURL(url);
+    _item->SetTransitionType(transition);
+    _item->SetTimestamp(base::Time::Now());
+    _item->SetPostData([@"Test data" dataUsingEncoding:NSUTF8StringEncoding]);
+    _sessionEntry.reset(
+        [[CRWSessionEntry alloc] initWithNavigationItem:_item.get()]);
   }
-  void TearDown() override { sessionEntry_.reset(); }
 
  protected:
-  base::scoped_nsobject<CRWSessionEntry> sessionEntry_;
+  std::unique_ptr<web::NavigationItemImpl> _item;
+  base::scoped_nsobject<CRWSessionEntry> _sessionEntry;
 };
 
 void CRWSessionEntryTest::expectEqualSessionEntries(
@@ -74,33 +73,25 @@ void SetUp() override {
 }
 
 TEST_F(CRWSessionEntryTest, Description) {
-  [sessionEntry_ navigationItem]->SetTitle(base::SysNSStringToUTF16(@"Title"));
-  EXPECT_NSEQ([sessionEntry_ description],
+  [_sessionEntry navigationItem]->SetTitle(base::SysNSStringToUTF16(@"Title"));
+  EXPECT_NSEQ([_sessionEntry description],
               @"url:http://init.test/ originalurl:http://init.test/ "
               @"title:Title transition:2 displayState:{ scrollOffset:(nan, "
               @"nan), zoomScaleRange:(nan, nan), zoomScale:nan } desktopUA:0");
 }
 
-TEST_F(CRWSessionEntryTest, CopyWithZone) {
-  CRWSessionEntry* sessionEntry2 = [sessionEntry_ copy];
-  EXPECT_NE(sessionEntry_, sessionEntry2);
-  expectEqualSessionEntries(
-      sessionEntry_, sessionEntry2,
-      [sessionEntry_ navigationItem]->GetTransitionType());
-}
-
 TEST_F(CRWSessionEntryTest, EmptyVirtualUrl) {
   EXPECT_EQ(GURL("http://init.test/"),
-            [sessionEntry_ navigationItem]->GetURL());
+            [_sessionEntry navigationItem]->GetURL());
 }
 
 TEST_F(CRWSessionEntryTest, NonEmptyVirtualUrl) {
-  web::NavigationItem* item = [sessionEntry_ navigationItem];
+  web::NavigationItem* item = [_sessionEntry navigationItem];
   item->SetVirtualURL(GURL("http://user.friendly"));
   EXPECT_EQ(GURL("http://user.friendly/"), item->GetVirtualURL());
   EXPECT_EQ(GURL("http://init.test/"), item->GetURL());
 }
 
 TEST_F(CRWSessionEntryTest, EmptyDescription) {
-  EXPECT_GT([[sessionEntry_ description] length], 0U);
+  EXPECT_GT([[_sessionEntry description] length], 0U);
 }