Moved |openedByDOM| to WebState's CreateParams and public interface.

ios/chrome/browser/sessions/session_window_unittest.mm

Index: ios/chrome/browser/sessions/session_window_unittest.mm
diff --git a/ios/chrome/browser/sessions/session_window_unittest.mm b/ios/chrome/browser/sessions/session_window_unittest.mm
index 15508700496f76af83d555ed462ada726288e168..ecd2d6d5b856b4bf4447b28236e7ff86338702aa 100644
--- a/ios/chrome/browser/sessions/session_window_unittest.mm
+++ b/ios/chrome/browser/sessions/session_window_unittest.mm
@@ -13,7 +13,6 @@
 #include "base/strings/sys_string_conversions.h"
 #include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
 #import "ios/chrome/browser/sessions/session_service.h"
-#import "ios/web/navigation/crw_session_controller.h"
 #import "ios/web/public/crw_session_storage.h"
 #include "ios/web/public/test/test_web_thread_bundle.h"
 #import "ios/web/public/web_state/web_state.h"
@@ -22,8 +21,6 @@
 #include "testing/platform_test.h"
 #import "third_party/ocmock/OCMock/OCMock.h"
 
-using web::WebStateImpl;
-
 @interface SessionWindowIOS (Testing)
 
 - (void)clearSessions;
@@ -40,10 +37,11 @@ void SetUp() override {
     chrome_browser_state_ = test_cbs_builder.Build();
   }
 
-  WebStateImpl* CreateWebState(BOOL openedByDOM) const {
-    WebStateImpl* webState = new WebStateImpl(chrome_browser_state_.get());
-    webState->GetNavigationManagerImpl().InitializeSession(openedByDOM);
-    return webState;
+  std::unique_ptr<web::WebState> CreateWebState(
+      bool created_with_opener) const {
+    web::WebState::CreateParams params(chrome_browser_state_.get());
+    params.created_with_opener = created_with_opener;
+    return web::WebState::Create(params);
   }
 
   web::TestWebThreadBundle thread_bundle_;
@@ -53,38 +51,46 @@ void SetUp() override {
 };
 
 TEST_F(SessionWindowIOSTest, InitEmpty) {
-  base::scoped_nsobject<SessionWindowIOS> sessionWindow(
+  base::scoped_nsobject<SessionWindowIOS> session_window(
       [[SessionWindowIOS alloc] init]);
-  EXPECT_TRUE(sessionWindow.get() != nil);
+  EXPECT_TRUE(session_window.get() != nil);
 }
 
 TEST_F(SessionWindowIOSTest, InitAddingSessions) {
-  std::unique_ptr<WebStateImpl> webState1(CreateWebState(NO));
-  std::unique_ptr<WebStateImpl> webState2(CreateWebState(NO));
-  base::scoped_nsobject<SessionWindowIOS> sessionWindow(
+  std::unique_ptr<web::WebState> web_state_1 =
+      CreateWebState(false /*created_with_opener*/);
+  std::unique_ptr<web::WebState> web_state_2 =
+      CreateWebState(false /*created_with_opener*/);
+  base::scoped_nsobject<SessionWindowIOS> session_window(
       [[SessionWindowIOS alloc] init]);
-  [sessionWindow addSerializedSessionStorage:webState1->BuildSessionStorage()];
-  [sessionWindow addSerializedSessionStorage:webState2->BuildSessionStorage()];
-  [sessionWindow setSelectedIndex:1];
-
-  EXPECT_TRUE(sessionWindow.get() != nil);
-  EXPECT_EQ(2U, sessionWindow.get().sessions.count);
-  [sessionWindow clearSessions];
-  EXPECT_EQ(0U, sessionWindow.get().sessions.count);
+  [session_window
+      addSerializedSessionStorage:web_state_1->BuildSessionStorage()];
+  [session_window
+      addSerializedSessionStorage:web_state_2->BuildSessionStorage()];
+  [session_window setSelectedIndex:1];
+
+  EXPECT_TRUE(session_window.get() != nil);
+  EXPECT_EQ(2U, session_window.get().sessions.count);
+  [session_window clearSessions];
+  EXPECT_EQ(0U, session_window.get().sessions.count);
 }
 
 TEST_F(SessionWindowIOSTest, CodingEncoding) {
-  base::scoped_nsobject<SessionWindowIOS> sessionWindow(
+  base::scoped_nsobject<SessionWindowIOS> session_window(
       [[SessionWindowIOS alloc] init]);
 
-  std::unique_ptr<WebStateImpl> webState1(CreateWebState(YES));
-  std::unique_ptr<WebStateImpl> webState2(CreateWebState(NO));
-  [sessionWindow addSerializedSessionStorage:webState1->BuildSessionStorage()];
-  [sessionWindow addSerializedSessionStorage:webState2->BuildSessionStorage()];
+  std::unique_ptr<web::WebState> web_state_1 =
+      CreateWebState(true /*created_with_opener*/);
+  std::unique_ptr<web::WebState> web_state_2 =
+      CreateWebState(false /*created_with_opener*/);
+  [session_window
+      addSerializedSessionStorage:web_state_1->BuildSessionStorage()];
+  [session_window
+      addSerializedSessionStorage:web_state_2->BuildSessionStorage()];
 
-  [sessionWindow setSelectedIndex:1];
+  [session_window setSelectedIndex:1];
 
-  NSData* data = [NSKeyedArchiver archivedDataWithRootObject:sessionWindow];
+  NSData* data = [NSKeyedArchiver archivedDataWithRootObject:session_window];
   EXPECT_TRUE(data != nil);
   base::scoped_nsobject<SessionWindowUnarchiver> unarchiver(
       [[SessionWindowUnarchiver alloc]
@@ -92,14 +98,14 @@ void SetUp() override {
                     browserState:chrome_browser_state_.get()]);
   SessionWindowIOS* unarchivedObj = [unarchiver decodeObjectForKey:@"root"];
   EXPECT_TRUE(unarchivedObj != nil);
-  EXPECT_EQ(unarchivedObj.selectedIndex, sessionWindow.get().selectedIndex);
+  EXPECT_EQ(unarchivedObj.selectedIndex, session_window.get().selectedIndex);
   NSArray* sessions = unarchivedObj.sessions;
   ASSERT_EQ(2U, sessions.count);
   CRWSessionStorage* unarchivedSession1 = sessions[0];
-  EXPECT_TRUE(unarchivedSession1.openedByDOM);
+  EXPECT_TRUE(unarchivedSession1.hasOpener);
 
   CRWSessionStorage* unarchivedSession2 = sessions[1];
-  EXPECT_FALSE(unarchivedSession2.openedByDOM);
+  EXPECT_FALSE(unarchivedSession2.hasOpener);
 }
 
 }  // anonymous namespace