Remove windowName from CRWSessionController.

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 "ios/web/navigation/crw_session_controller.h"
 
 #import <Foundation/Foundation.h>
 
 #include <utility>
 
@@ skipping 29 matching lines @@
   DCHECK([self currentEntry]);
   return [self currentEntry].navigationItem->GetURL();
 }
 @end
 
 namespace {
 
 class CRWSessionControllerTest : public PlatformTest {
  protected:
   void SetUp() override {
-    session_controller_.reset(
-        [[CRWSessionController alloc] initWithWindowName:@"test window"
-                                             openedByDOM:NO
-                                            browserState:&browser_state_]);
+    session_controller_.reset([[CRWSessionController alloc]
+        initWithBrowserState:&browser_state_
+                 openedByDOM:NO]);
   }
 
   web::Referrer MakeReferrer(const std::string& url) {
     return web::Referrer(GURL(url), web::ReferrerPolicyDefault);
   }
 
   web::TestWebThreadBundle thread_bundle_;
   web::TestBrowserState browser_state_;
   base::scoped_nsobject<CRWSessionController> session_controller_;
 };
 
-TEST_F(CRWSessionControllerTest, InitWithWindowName) {
-  EXPECT_NSEQ(@"test window", [session_controller_ windowName]);
+TEST_F(CRWSessionControllerTest, Init) {
   EXPECT_FALSE([session_controller_ isOpenedByDOM]);
   EXPECT_EQ(0U, [[session_controller_ entries] count]);
   EXPECT_EQ(nil, [session_controller_ currentEntry]);
 }
 
 // Tests session controller state after setting a pending index.
 TEST_F(CRWSessionControllerTest, SetPendingIndex) {
   [session_controller_
       addPendingItem:GURL("http://www.example.com")
             referrer:web::Referrer()
@@ skipping 426 matching lines @@
       initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
   [session_controller_
       addPendingItem:GURL("http://www.url.com/3")
             referrer:web::Referrer()
           transition:ui::PAGE_TRANSITION_TYPED
       initiationType:web::NavigationInitiationType::USER_INITIATED];
 
   // Create source session controller with 1 committed entry.
   base::scoped_nsobject<CRWSessionController> other_session_controller(
-      [[CRWSessionController alloc] initWithWindowName:nil
-                                           openedByDOM:NO
-                                          browserState:&browser_state_]);
-  [other_session_controller setWindowName:@"test-window"];
+      [[CRWSessionController alloc] initWithBrowserState:&browser_state_
+                                             openedByDOM:NO]);
   [other_session_controller
       addPendingItem:GURL("http://www.url.com/0")
             referrer:web::Referrer()
           transition:ui::PAGE_TRANSITION_TYPED
       initiationType:web::NavigationInitiationType::USER_INITIATED];
   [other_session_controller commitPendingItem];
   [other_session_controller
       addPendingItem:GURL("http://www.url.com/1")
             referrer:web::Referrer()
           transition:ui::PAGE_TRANSITION_TYPED
       initiationType:web::NavigationInitiationType::USER_INITIATED];
 
   // Insert and verify the state of target session controller.
   [session_controller_
       insertStateFromSessionController:other_session_controller.get()];
 
-  EXPECT_NSEQ(@"test-window", [session_controller_ windowName]);
   EXPECT_EQ(2U, [[session_controller_ entries] count]);
   EXPECT_EQ(1, [session_controller_ currentNavigationIndex]);
   EXPECT_EQ(-1, [session_controller_ previousNavigationIndex]);
   EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
 
   EXPECT_EQ(GURL("http://www.url.com/0"),
             [session_controller_ URLForSessionAtIndex:0]);
   EXPECT_EQ(GURL("http://www.url.com/2"),
             [session_controller_ URLForSessionAtIndex:1]);
   EXPECT_EQ(GURL("http://www.url.com/3"),
@@ skipping 11 matching lines @@
   [session_controller_ commitPendingItem];
   [session_controller_
       addPendingItem:GURL("http://www.url.com/1")
             referrer:web::Referrer()
           transition:ui::PAGE_TRANSITION_TYPED
       initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
 
   // Create empty source session controller.
   base::scoped_nsobject<CRWSessionController> other_session_controller(
-      [[CRWSessionController alloc] initWithWindowName:nil
-                                           openedByDOM:NO
-                                          browserState:&browser_state_]);
-  [other_session_controller setWindowName:@"test-window"];
+      [[CRWSessionController alloc] initWithBrowserState:&browser_state_
+                                             openedByDOM:NO]);
 
   // Insert and verify the state of target session controller.
   [session_controller_
       insertStateFromSessionController:other_session_controller.get()];
-
-  EXPECT_NSEQ(@"test-window", [session_controller_ windowName]);
   EXPECT_EQ(2U, [[session_controller_ entries] count]);
   EXPECT_EQ(1, [session_controller_ currentNavigationIndex]);
   EXPECT_EQ(0, [session_controller_ previousNavigationIndex]);
   EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
   EXPECT_FALSE([session_controller_ pendingEntry]);
   EXPECT_EQ(GURL("http://www.url.com/0"),
             [session_controller_ URLForSessionAtIndex:0]);
   EXPECT_EQ(GURL("http://www.url.com/1"),
             [session_controller_ URLForSessionAtIndex:1]);
 }
 
 // Tests inserting session controller state to empty session controller.
 TEST_F(CRWSessionControllerTest, InsertStateToEmptySessionController) {
   // Create source session controller with 2 committed entries and one
   // pending entry.
   base::scoped_nsobject<CRWSessionController> other_session_controller(
-      [[CRWSessionController alloc] initWithWindowName:nil
-                                           openedByDOM:NO
-                                          browserState:&browser_state_]);
-  [other_session_controller setWindowName:@"test-window"];
+      [[CRWSessionController alloc] initWithBrowserState:&browser_state_
+                                             openedByDOM:NO]);
   [other_session_controller
       addPendingItem:GURL("http://www.url.com/0")
             referrer:web::Referrer()
           transition:ui::PAGE_TRANSITION_TYPED
       initiationType:web::NavigationInitiationType::USER_INITIATED];
   [other_session_controller commitPendingItem];
   [other_session_controller
       addPendingItem:GURL("http://www.url.com/1")
             referrer:web::Referrer()
           transition:ui::PAGE_TRANSITION_TYPED
       initiationType:web::NavigationInitiationType::USER_INITIATED];
   [other_session_controller commitPendingItem];
   [other_session_controller
       addPendingItem:GURL("http://www.url.com/2")
             referrer:web::Referrer()
           transition:ui::PAGE_TRANSITION_TYPED
       initiationType:web::NavigationInitiationType::USER_INITIATED];
 
   // Insert and verify the state of target session controller.
   [session_controller_
       insertStateFromSessionController:other_session_controller.get()];
 
-  EXPECT_NSEQ(@"test-window", [session_controller_ windowName]);
   EXPECT_EQ(2U, [[session_controller_ entries] count]);
   EXPECT_EQ(1, [session_controller_ currentNavigationIndex]);
   EXPECT_EQ(-1, [session_controller_ previousNavigationIndex]);
   EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
   EXPECT_FALSE([session_controller_ pendingEntry]);
   EXPECT_EQ(GURL("http://www.url.com/0"),
             [session_controller_ URLForSessionAtIndex:0]);
   EXPECT_EQ(GURL("http://www.url.com/1"),
             [session_controller_ URLForSessionAtIndex:1]);
 }
@@ skipping 12 matching lines @@
   [session_controller_
       addPendingItem:GURL("http://www.url.com/3")
             referrer:web::Referrer()
           transition:ui::PAGE_TRANSITION_TYPED
       initiationType:web::NavigationInitiationType::USER_INITIATED];
   [session_controller_ commitPendingItem];
   [session_controller_ setPendingItemIndex:0];
 
   // Create source session controller with 1 committed entry.
   base::scoped_nsobject<CRWSessionController> other_session_controller(
-      [[CRWSessionController alloc] initWithWindowName:nil
-                                           openedByDOM:NO
-                                          browserState:&browser_state_]);
-  [other_session_controller setWindowName:@"test-window"];
+      [[CRWSessionController alloc] initWithBrowserState:&browser_state_
+                                             openedByDOM:NO]);
   [other_session_controller
       addPendingItem:GURL("http://www.url.com/0")
             referrer:web::Referrer()
           transition:ui::PAGE_TRANSITION_TYPED
       initiationType:web::NavigationInitiationType::USER_INITIATED];
   [other_session_controller commitPendingItem];
 
   // Insert and verify the state of target session controller.
   [session_controller_
       insertStateFromSessionController:other_session_controller.get()];
 
-  EXPECT_NSEQ(@"test-window", [session_controller_ windowName]);
   EXPECT_EQ(3U, [[session_controller_ entries] count]);
   EXPECT_EQ(2, [session_controller_ currentNavigationIndex]);
   EXPECT_EQ(-1, [session_controller_ previousNavigationIndex]);
   EXPECT_EQ(1, [session_controller_ pendingItemIndex]);
   EXPECT_EQ(GURL("http://www.url.com/0"),
             [session_controller_ URLForSessionAtIndex:0]);
   EXPECT_EQ(GURL("http://www.url.com/2"),
             [session_controller_ URLForSessionAtIndex:1]);
   EXPECT_EQ(GURL("http://www.url.com/2"),
             [[session_controller_ pendingEntry] navigationItem]->GetURL());
@@ skipping 22 matching lines @@
   navigation_item->SetReferrer(referrer_object);
   navigation_item->SetTitle(base::SysNSStringToUTF16(title));
   navigation_item->SetTransitionType(ui::PAGE_TRANSITION_TYPED);
 
   return navigation_item;
 }
 
 TEST_F(CRWSessionControllerTest, CreateWithEmptyNavigations) {
   std::vector<std::unique_ptr<web::NavigationItem>> items;
   base::scoped_nsobject<CRWSessionController> controller(
-      [[CRWSessionController alloc] initWithNavigationItems:std::move(items)
-                                               currentIndex:0
-                                               browserState:&browser_state_]);
+      [[CRWSessionController alloc] initWithBrowserState:&browser_state_
+                                         navigationItems:std::move(items)
+                                            currentIndex:0]);
   EXPECT_EQ(controller.get().entries.count, 0U);
   EXPECT_EQ(controller.get().currentNavigationIndex, -1);
   EXPECT_EQ(controller.get().previousNavigationIndex, -1);
   EXPECT_FALSE(controller.get().currentEntry);
 }
 
 TEST_F(CRWSessionControllerTest, CreateWithNavList) {
   std::vector<std::unique_ptr<web::NavigationItem>> items;
   items.push_back(CreateNavigationItem("http://www.google.com",
                                        "http://www.referrer.com", @"Google"));
   items.push_back(CreateNavigationItem("http://www.yahoo.com",
                                        "http://www.google.com", @"Yahoo"));
   items.push_back(CreateNavigationItem("http://www.espn.com",
                                        "http://www.nothing.com", @"ESPN"));
   base::scoped_nsobject<CRWSessionController> controller(
-      [[CRWSessionController alloc] initWithNavigationItems:std::move(items)
-                                               currentIndex:1
-                                               browserState:&browser_state_]);
+      [[CRWSessionController alloc] initWithBrowserState:&browser_state_
+                                         navigationItems:std::move(items)
+                                            currentIndex:1]);
 
   EXPECT_EQ(controller.get().entries.count, 3U);
   EXPECT_EQ(controller.get().currentNavigationIndex, 1);
   EXPECT_EQ(controller.get().previousNavigationIndex, -1);
   // Sanity check the current entry, the CRWSessionEntry unit test will ensure
   // the entire object is created properly.
   CRWSessionEntry* current_entry = controller.get().currentEntry;
   EXPECT_EQ(current_entry.navigationItem->GetURL(),
             GURL("http://www.yahoo.com"));
 }
@@ skipping 39 matching lines @@
 
 TEST_F(CRWSessionControllerTest, PushNewEntry) {
   std::vector<std::unique_ptr<web::NavigationItem>> items;
   items.push_back(CreateNavigationItem("http://www.firstpage.com",
                                        "http://www.starturl.com", @"First"));
   items.push_back(CreateNavigationItem("http://www.secondpage.com",
                                        "http://www.firstpage.com", @"Second"));
   items.push_back(CreateNavigationItem("http://www.thirdpage.com",
                                        "http://www.secondpage.com", @"Third"));
   base::scoped_nsobject<CRWSessionController> controller(
-      [[CRWSessionController alloc] initWithNavigationItems:std::move(items)
-                                               currentIndex:0
-                                               browserState:&browser_state_]);
+      [[CRWSessionController alloc] initWithBrowserState:&browser_state_
+                                         navigationItems:std::move(items)
+                                            currentIndex:0]);
 
   GURL pushPageGurl1("http://www.firstpage.com/#push1");
   NSString* stateObject1 = @"{'foo': 1}";
   [controller pushNewItemWithURL:pushPageGurl1
                      stateObject:stateObject1
                       transition:ui::PAGE_TRANSITION_LINK];
   CRWSessionEntry* pushedEntry = [controller currentEntry];
   web::NavigationItemImpl* pushedItem = pushedEntry.navigationItemImpl;
   NSUInteger expectedCount = 2;
   EXPECT_EQ(expectedCount, controller.get().entries.count);
@@ skipping 29 matching lines @@
                                        "http://foo.com#bar", @"Third"));
   items.push_back(
       CreateNavigationItem("http://foo.com", "http://google.com", @"Fourth"));
   // Push state navigation.
   items.push_back(
       CreateNavigationItem("http://foo.com/bar", "http://foo.com", @"Fifth"));
   // Push state navigation.
   items.push_back(CreateNavigationItem("http://foo.com/bar#bar",
                                        "http://foo.com/bar", @"Sixth"));
   base::scoped_nsobject<CRWSessionController> controller(
-      [[CRWSessionController alloc] initWithNavigationItems:std::move(items)
-                                               currentIndex:0
-                                               browserState:&browser_state_]);
+      [[CRWSessionController alloc] initWithBrowserState:&browser_state_
+                                         navigationItems:std::move(items)
+                                            currentIndex:0]);
   web::NavigationItemImpl* item0 =
       static_cast<web::NavigationItemImpl*>([controller items][0]);
   web::NavigationItemImpl* item1 =
       static_cast<web::NavigationItemImpl*>([controller items][1]);
   web::NavigationItemImpl* item2 =
       static_cast<web::NavigationItemImpl*>([controller items][2]);
   web::NavigationItemImpl* item3 =
       static_cast<web::NavigationItemImpl*>([controller items][3]);
   web::NavigationItemImpl* item4 =
       static_cast<web::NavigationItemImpl*>([controller items][4]);
@@ skipping 21 matching lines @@
 
 TEST_F(CRWSessionControllerTest, UpdateCurrentEntry) {
   std::vector<std::unique_ptr<web::NavigationItem>> items;
   items.push_back(CreateNavigationItem("http://www.firstpage.com",
                                        "http://www.starturl.com", @"First"));
   items.push_back(CreateNavigationItem("http://www.secondpage.com",
                                        "http://www.firstpage.com", @"Second"));
   items.push_back(CreateNavigationItem("http://www.thirdpage.com",
                                        "http://www.secondpage.com", @"Third"));
   base::scoped_nsobject<CRWSessionController> controller(
-      [[CRWSessionController alloc] initWithNavigationItems:std::move(items)
-                                               currentIndex:0
-                                               browserState:&browser_state_]);
+      [[CRWSessionController alloc] initWithBrowserState:&browser_state_
+                                         navigationItems:std::move(items)
+                                            currentIndex:0]);
 
   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 updateCurrentItemWithURL:replacePageGurl1
                            stateObject:stateObject1];
   CRWSessionEntry* replacedEntry = [controller currentEntry];
   web::NavigationItemImpl* replacedItem = replacedEntry.navigationItemImpl;
@@ skipping 261 matching lines @@
   [session_controller_
       addPendingItem:GURL("http://www.example.com/0")
             referrer:MakeReferrer("http://www.example.com/b")
           transition:ui::PAGE_TRANSITION_CLIENT_REDIRECT
       initiationType:web::NavigationInitiationType::RENDERER_INITIATED];
   [session_controller_ commitPendingItem];
   EXPECT_EQ(0U, [session_controller_ backwardEntries].count);
 }
 
 }  // anonymous namespace