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

ios/chrome/browser/sessions/session_window_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/chrome/browser/sessions/session_window.h"
 
 #import <Foundation/Foundation.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/mac/scoped_nsobject.h"
 #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"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 #import "third_party/ocmock/OCMock/OCMock.h"
 
-using web::WebStateImpl;
-
 @interface SessionWindowIOS (Testing)
 
 - (void)clearSessions;
 
 @end
 
 namespace {
 
 class SessionWindowIOSTest : public PlatformTest {
  protected:
   void SetUp() override {
     PlatformTest::SetUp();
     TestChromeBrowserState::Builder test_cbs_builder;
     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 opened_by_dom) const {
+    web::WebState::CreateParams params(chrome_browser_state_.get());
+    params.opened_by_dom = opened_by_dom;
+    return web::WebState::Create(params);
   }
 
   web::TestWebThreadBundle thread_bundle_;
   // TODO(crbug.com/661639): Switch to TestBrowserState once this test is moved
   // to be in the ios_web_unittests target.
   std::unique_ptr<TestChromeBrowserState> chrome_browser_state_;
 };
 
 TEST_F(SessionWindowIOSTest, InitEmpty) {
   base::scoped_nsobject<SessionWindowIOS> sessionWindow(
       [[SessionWindowIOS alloc] init]);
   EXPECT_TRUE(sessionWindow.get() != nil);
 }
 
 TEST_F(SessionWindowIOSTest, InitAddingSessions) {
-  std::unique_ptr<WebStateImpl> webState1(CreateWebState(NO));
-  std::unique_ptr<WebStateImpl> webState2(CreateWebState(NO));
+  std::unique_ptr<web::WebState> webState1 = CreateWebState(false);

[Eugene But (OOO till 7-30), 2017/03/16 15:31:19]

nit: false /*opened_by_dom*/

[kkhorimoto, 2017/03/17 23:04:49]

Done.

+  std::unique_ptr<web::WebState> webState2 = CreateWebState(false);
   base::scoped_nsobject<SessionWindowIOS> sessionWindow(
       [[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);
 }
 
 TEST_F(SessionWindowIOSTest, CodingEncoding) {
   base::scoped_nsobject<SessionWindowIOS> sessionWindow(
       [[SessionWindowIOS alloc] init]);
 
-  std::unique_ptr<WebStateImpl> webState1(CreateWebState(YES));
-  std::unique_ptr<WebStateImpl> webState2(CreateWebState(NO));
+  std::unique_ptr<web::WebState> webState1 = CreateWebState(true);

[Eugene But (OOO till 7-30), 2017/03/16 15:31:19]

ditto

[kkhorimoto, 2017/03/17 23:04:49]

Done.

+  std::unique_ptr<web::WebState> webState2 = CreateWebState(false);
   [sessionWindow addSerializedSessionStorage:webState1->BuildSessionStorage()];
   [sessionWindow addSerializedSessionStorage:webState2->BuildSessionStorage()];
 
   [sessionWindow setSelectedIndex:1];
 
   NSData* data = [NSKeyedArchiver archivedDataWithRootObject:sessionWindow];
   EXPECT_TRUE(data != nil);
   base::scoped_nsobject<SessionWindowUnarchiver> unarchiver(
       [[SessionWindowUnarchiver alloc]
           initForReadingWithData:data
                     browserState:chrome_browser_state_.get()]);
   SessionWindowIOS* unarchivedObj = [unarchiver decodeObjectForKey:@"root"];
   EXPECT_TRUE(unarchivedObj != nil);
   EXPECT_EQ(unarchivedObj.selectedIndex, sessionWindow.get().selectedIndex);
   NSArray* sessions = unarchivedObj.sessions;
   ASSERT_EQ(2U, sessions.count);
   CRWSessionStorage* unarchivedSession1 = sessions[0];
   EXPECT_TRUE(unarchivedSession1.openedByDOM);
 
   CRWSessionStorage* unarchivedSession2 = sessions[1];
   EXPECT_FALSE(unarchivedSession2.openedByDOM);
 }
 
 }  // anonymous namespace