[Sync] Introduce SyncedSessionWindow type.

components/sync_sessions/revisit/sessions_page_revisit_observer_unittest.cc

Index: components/sync_sessions/revisit/sessions_page_revisit_observer_unittest.cc
diff --git a/components/sync_sessions/revisit/sessions_page_revisit_observer_unittest.cc b/components/sync_sessions/revisit/sessions_page_revisit_observer_unittest.cc
index e7b3181d3d32779b36d8108c1c0ae5515590bc99..b86549eba22b4323f09b70afb6d71640addb3256 100644
--- a/components/sync_sessions/revisit/sessions_page_revisit_observer_unittest.cc
+++ b/components/sync_sessions/revisit/sessions_page_revisit_observer_unittest.cc
@@ -87,39 +87,39 @@ TEST_F(SessionsPageRevisitObserverTest, RunMatchersNoSessions) {
 }
 
 TEST_F(SessionsPageRevisitObserverTest, RunMatchersNoWindows) {
-  std::unique_ptr<SyncedSession> session = base::MakeUnique<SyncedSession>();
+  auto session = base::MakeUnique<SyncedSession>();
   CheckAndExpect(session.get(), GURL(kExampleUrl), false, false);
 }
 
 TEST_F(SessionsPageRevisitObserverTest, RunMatchersNoTabs) {
-  std::unique_ptr<SyncedSession> session = base::MakeUnique<SyncedSession>();
-  session->windows[0] = base::MakeUnique<SessionWindow>();
+  auto session = base::MakeUnique<SyncedSession>();
+  session->windows[0] = base::MakeUnique<SyncedSessionWindow>();
   CheckAndExpect(session.get(), GURL(kExampleUrl), false, false);
 }
 
 TEST_F(SessionsPageRevisitObserverTest, RunMatchersNoEntries) {
-  std::unique_ptr<SessionWindow> window = base::MakeUnique<SessionWindow>();
-  window->tabs.push_back(base::MakeUnique<SessionTab>());
-  std::unique_ptr<SyncedSession> session = base::MakeUnique<SyncedSession>();
+  auto window = base::MakeUnique<SyncedSessionWindow>();
+  window->wrapped_window.tabs.push_back(base::MakeUnique<SessionTab>());
+  auto session = base::MakeUnique<SyncedSession>();
   session->windows[0] = std::move(window);
   CheckAndExpect(session.get(), GURL(kExampleUrl), false, false);
 }
 
 TEST_F(SessionsPageRevisitObserverTest, RunMatchersSingle) {
-  std::unique_ptr<SessionTab> tab = base::MakeUnique<SessionTab>();
+  auto tab = base::MakeUnique<SessionTab>();
   tab->navigations.push_back(
       sessions::SerializedNavigationEntryTestHelper::CreateNavigation(
           kExampleUrl, ""));
   tab->current_navigation_index = 0;
-  std::unique_ptr<SessionWindow> window = base::MakeUnique<SessionWindow>();
-  window->tabs.push_back(std::move(tab));
-  std::unique_ptr<SyncedSession> session = base::MakeUnique<SyncedSession>();
+  auto window = base::MakeUnique<SyncedSessionWindow>();
+  window->wrapped_window.tabs.push_back(std::move(tab));
+  auto session = base::MakeUnique<SyncedSession>();
   session->windows[0] = std::move(window);
   CheckAndExpect(session.get(), GURL(kExampleUrl), true, false);
 }
 
 TEST_F(SessionsPageRevisitObserverTest, RunMatchersFalseProvider) {
-  std::unique_ptr<SessionTab> tab = base::MakeUnique<SessionTab>();
+  auto tab = base::MakeUnique<SessionTab>();
   tab->navigations.push_back(
       sessions::SerializedNavigationEntryTestHelper::CreateNavigation(
           kExampleUrl, ""));
@@ -127,9 +127,9 @@ TEST_F(SessionsPageRevisitObserverTest, RunMatchersFalseProvider) {
       sessions::SerializedNavigationEntryTestHelper::CreateNavigation(
           kExampleUrl, ""));
   tab->current_navigation_index = 1;
-  std::unique_ptr<SessionWindow> window = base::MakeUnique<SessionWindow>();
-  window->tabs.push_back(std::move(tab));
-  std::unique_ptr<SyncedSession> session = base::MakeUnique<SyncedSession>();
+  auto window = base::MakeUnique<SyncedSessionWindow>();
+  window->wrapped_window.tabs.push_back(std::move(tab));
+  auto session = base::MakeUnique<SyncedSession>();
   session->windows[0] = std::move(window);
 
   // The provider returns false when asked for foreign sessions, even though
@@ -142,25 +142,25 @@ TEST_F(SessionsPageRevisitObserverTest, RunMatchersFalseProvider) {
 }
 
 TEST_F(SessionsPageRevisitObserverTest, RunMatchersMany) {
-  std::unique_ptr<SessionTab> tab1 = base::MakeUnique<SessionTab>();
+  auto tab1 = base::MakeUnique<SessionTab>();
   tab1->navigations.push_back(
       sessions::SerializedNavigationEntryTestHelper::CreateNavigation(
           kExampleUrl, ""));
   tab1->current_navigation_index = 0;
 
-  std::unique_ptr<SessionTab> tab2 = base::MakeUnique<SessionTab>();
+  auto tab2 = base::MakeUnique<SessionTab>();
   tab2->navigations.push_back(
       sessions::SerializedNavigationEntryTestHelper::CreateNavigation(
           kDifferentUrl, ""));
   tab2->current_navigation_index = 0;
 
-  std::unique_ptr<SessionTab> tab3 = base::MakeUnique<SessionTab>();
+  auto tab3 = base::MakeUnique<SessionTab>();
   tab3->navigations.push_back(
       sessions::SerializedNavigationEntryTestHelper::CreateNavigation(
           kDifferentUrl, ""));
   tab3->current_navigation_index = 0;
 
-  std::unique_ptr<SessionTab> tab4 = base::MakeUnique<SessionTab>();
+  auto tab4 = base::MakeUnique<SessionTab>();
   tab4->navigations.push_back(
       sessions::SerializedNavigationEntryTestHelper::CreateNavigation(
           kExampleUrl, ""));
@@ -169,17 +169,17 @@ TEST_F(SessionsPageRevisitObserverTest, RunMatchersMany) {
           kDifferentUrl, ""));
   tab4->current_navigation_index = 1;
 
-  std::unique_ptr<SessionWindow> window1 = base::MakeUnique<SessionWindow>();
-  window1->tabs.push_back(std::move(tab1));
-  std::unique_ptr<SessionWindow> window2 = base::MakeUnique<SessionWindow>();
-  window2->tabs.push_back(std::move(tab2));
-  std::unique_ptr<SessionWindow> window3 = base::MakeUnique<SessionWindow>();
-  window3->tabs.push_back(std::move(tab3));
-  window3->tabs.push_back(std::move(tab4));
+  auto window1 = base::MakeUnique<SyncedSessionWindow>();
+  window1->wrapped_window.tabs.push_back(std::move(tab1));
+  auto window2 = base::MakeUnique<SyncedSessionWindow>();
+  window2->wrapped_window.tabs.push_back(std::move(tab2));
+  auto window3 = base::MakeUnique<SyncedSessionWindow>();
+  window3->wrapped_window.tabs.push_back(std::move(tab3));
+  window3->wrapped_window.tabs.push_back(std::move(tab4));
 
-  std::unique_ptr<SyncedSession> session1 = base::MakeUnique<SyncedSession>();
+  auto session1 = base::MakeUnique<SyncedSession>();
   session1->windows[1] = std::move(window1);
-  std::unique_ptr<SyncedSession> session2 = base::MakeUnique<SyncedSession>();
+  auto session2 = base::MakeUnique<SyncedSession>();
   session2->windows[2] = std::move(window2);
   session2->windows[3] = std::move(window3);