Re-sync ios/web with downstream version

ios/web/navigation/crw_session_controller_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 <Foundation/Foundation.h>
 
 #include "base/logging.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 819 matching lines @@
                                        "http://www.secondpage.com", @"Third"));
   base::scoped_nsobject<CRWSessionController> controller(
       [[CRWSessionController alloc] initWithNavigationItems:items.Pass()
                                                currentIndex:0
                                                browserState:&browser_state_]);
 
   GURL pushPageGurl1("http://www.firstpage.com/#push1");
   NSString* stateObject1 = @"{'foo': 1}";
   [controller pushNewEntryWithURL:pushPageGurl1 stateObject:stateObject1];
   CRWSessionEntry* pushedEntry = [controller currentEntry];
+  web::NavigationItemImpl* pushedItem = pushedEntry.navigationItemImpl;
   NSUInteger expectedCount = 2;
   EXPECT_EQ(expectedCount, controller.get().entries.count);
   EXPECT_EQ(pushPageGurl1, pushedEntry.navigationItem->GetURL());
-  EXPECT_TRUE(pushedEntry.createdFromPushState);
-  EXPECT_NSEQ(stateObject1, pushedEntry.serializedStateObject);
+  EXPECT_TRUE(pushedItem->IsCreatedFromPushState());
+  EXPECT_NSEQ(stateObject1, pushedItem->GetSerializedStateObject());
   EXPECT_EQ(GURL("http://www.firstpage.com/"),
             pushedEntry.navigationItem->GetReferrer().url);
 
   // Add another new entry and check size and fields again.
   GURL pushPageGurl2("http://www.firstpage.com/push2");
   [controller pushNewEntryWithURL:pushPageGurl2 stateObject:nil];
   pushedEntry = [controller currentEntry];
+  pushedItem = pushedEntry.navigationItemImpl;
   expectedCount = 3;
   EXPECT_EQ(expectedCount, controller.get().entries.count);
   EXPECT_EQ(pushPageGurl2, pushedEntry.navigationItem->GetURL());
-  EXPECT_TRUE(pushedEntry.createdFromPushState);
-  EXPECT_EQ(nil, pushedEntry.serializedStateObject);
+  EXPECT_TRUE(pushedItem->IsCreatedFromPushState());
+  EXPECT_EQ(nil, pushedItem->GetSerializedStateObject());
   EXPECT_EQ(pushPageGurl1, pushedEntry.navigationItem->GetReferrer().url);
 }
 
 TEST_F(CRWSessionControllerTest, IsPushStateNavigation) {
   ScopedVector<web::NavigationItem> items;
   items.push_back(
       CreateNavigationItem("http://foo.com", "http://google.com", @"First"));
   // Push state navigation.
   items.push_back(
       CreateNavigationItem("http://foo.com#bar", "http://foo.com", @"Second"));
@@ skipping 10 matching lines @@
   base::scoped_nsobject<CRWSessionController> controller(
       [[CRWSessionController alloc] initWithNavigationItems:items.Pass()
                                                currentIndex:0
                                                browserState:&browser_state_]);
   CRWSessionEntry* entry0 = [controller.get().entries objectAtIndex:0];
   CRWSessionEntry* entry1 = [controller.get().entries objectAtIndex:1];
   CRWSessionEntry* entry2 = [controller.get().entries objectAtIndex:2];
   CRWSessionEntry* entry3 = [controller.get().entries objectAtIndex:3];
   CRWSessionEntry* entry4 = [controller.get().entries objectAtIndex:4];
   CRWSessionEntry* entry5 = [controller.get().entries objectAtIndex:5];
-  entry1.createdFromPushState = YES;
-  entry4.createdFromPushState = YES;
-  entry5.createdFromPushState = YES;
+  entry1.navigationItemImpl->SetIsCreatedFromPushState(true);
+  entry4.navigationItemImpl->SetIsCreatedFromPushState(true);
+  entry5.navigationItemImpl->SetIsCreatedFromPushState(true);
 
   EXPECT_TRUE(
       [controller isPushStateNavigationBetweenEntry:entry0 andEntry:entry1]);
   EXPECT_TRUE(
       [controller isPushStateNavigationBetweenEntry:entry5 andEntry:entry3]);
   EXPECT_TRUE(
       [controller isPushStateNavigationBetweenEntry:entry4 andEntry:entry3]);
   EXPECT_FALSE(
       [controller isPushStateNavigationBetweenEntry:entry1 andEntry:entry2]);
   EXPECT_FALSE(
@@ skipping 16 matching lines @@
                                                browserState:&browser_state_]);
 
   GURL replacePageGurl1("http://www.firstpage.com/#replace1");
   NSString* stateObject1 = @"{'foo': 1}";
 
   // Replace current entry and check the size of history and fields of the
   // modified entry.
   [controller updateCurrentEntryWithURL:replacePageGurl1
                             stateObject:stateObject1];
   CRWSessionEntry* replacedEntry = [controller currentEntry];
+  web::NavigationItemImpl* replacedItem = replacedEntry.navigationItemImpl;
   NSUInteger expectedCount = 3;
   EXPECT_EQ(expectedCount, controller.get().entries.count);
   EXPECT_EQ(replacePageGurl1, replacedEntry.navigationItem->GetURL());
-  EXPECT_FALSE(replacedEntry.createdFromPushState);
-  EXPECT_NSEQ(stateObject1, replacedEntry.serializedStateObject);
+  EXPECT_FALSE(replacedItem->IsCreatedFromPushState());
+  EXPECT_NSEQ(stateObject1, replacedItem->GetSerializedStateObject());
   EXPECT_EQ(GURL("http://www.starturl.com/"),
             replacedEntry.navigationItem->GetReferrer().url);
 
   // Replace current entry and check size and fields again.
   GURL replacePageGurl2("http://www.firstpage.com/#replace2");
   [controller.get() updateCurrentEntryWithURL:replacePageGurl2 stateObject:nil];
   replacedEntry = [controller currentEntry];
+  replacedItem = replacedEntry.navigationItemImpl;
   EXPECT_EQ(expectedCount, controller.get().entries.count);
   EXPECT_EQ(replacePageGurl2, replacedEntry.navigationItem->GetURL());
-  EXPECT_FALSE(replacedEntry.createdFromPushState);
-  EXPECT_NSEQ(nil, replacedEntry.serializedStateObject);
+  EXPECT_FALSE(replacedItem->IsCreatedFromPushState());
+  EXPECT_NSEQ(nil, replacedItem->GetSerializedStateObject());
   EXPECT_EQ(GURL("http://www.starturl.com/"),
             replacedEntry.navigationItem->GetReferrer().url);
 }
 
 TEST_F(CRWSessionControllerTest, TestBackwardForwardEntries) {
   [session_controller_ addPendingEntry:GURL("http://www.example.com/0")
                              referrer:MakeReferrer("http://www.example.com/a")
                            transition:ui::PAGE_TRANSITION_LINK
                     rendererInitiated:NO];
   [session_controller_ commitPendingEntry];
@@ skipping 61 matching lines @@
 
   // Remove an entry and attempt to go it. Ensure it outlives the removal.
   base::scoped_nsobject<CRWSessionEntry> entry3(
       [[session_controller_.get().entries objectAtIndex:3] retain]);
   [session_controller_ removeEntryAtIndex:3];
   [session_controller_ goToEntry:entry3];
   EXPECT_EQ(1, session_controller_.get().currentNavigationIndex);
 }
 
 }  // anonymous namespace