Updated CRWSessionController interface to use NavigationItems.

ios/web/navigation/crw_session_entry_unittest.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"
 
 #import <Foundation/Foundation.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 22 matching lines @@
     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(
+    _sessionEntry.reset(
         [[CRWSessionEntry alloc] initWithNavigationItem:std::move(item)]);
   }
-  void TearDown() override { sessionEntry_.reset(); }
 
  protected:
-  base::scoped_nsobject<CRWSessionEntry> sessionEntry_;
+  base::scoped_nsobject<CRWSessionEntry> _sessionEntry;

[Eugene But (OOO till 7-30), 2017/02/03 23:33:33]

If you want to fix this ivar then it should be session_entry_. 

[kkhorimoto, 2017/02/04 02:45:30]

Done.

 };
 
 void CRWSessionEntryTest::expectEqualSessionEntries(
     CRWSessionEntry* entry1,
     CRWSessionEntry* entry2,
     ui::PageTransition transition) {
   web::NavigationItemImpl* navItem1 = entry1.navigationItemImpl;
   web::NavigationItemImpl* navItem2 = entry2.navigationItemImpl;
   // url is not compared because it could differ after copy or archive.
   EXPECT_EQ(navItem1->GetVirtualURL(), navItem2->GetVirtualURL());
   EXPECT_EQ(navItem1->GetReferrer().url, navItem2->GetReferrer().url);
   EXPECT_EQ(navItem1->GetTimestamp(), navItem2->GetTimestamp());
   EXPECT_EQ(navItem1->GetTitle(), navItem2->GetTitle());
   EXPECT_EQ(navItem1->GetPageDisplayState(), navItem2->GetPageDisplayState());
   EXPECT_EQ(navItem1->ShouldSkipRepostFormConfirmation(),
             navItem2->ShouldSkipRepostFormConfirmation());
   EXPECT_EQ(navItem1->IsOverridingUserAgent(),
             navItem2->IsOverridingUserAgent());
   EXPECT_TRUE((!navItem1->HasPostData() && !navItem2->HasPostData()) ||
               [navItem1->GetPostData() isEqualToData:navItem2->GetPostData()]);
   EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
       navItem2->GetTransitionType(), transition));
   EXPECT_NSEQ(navItem1->GetHttpRequestHeaders(),
               navItem2->GetHttpRequestHeaders());
 }
 
 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);
 }