[Sync] Introduce SyncedSessionWindow type.

chrome/browser/sync/test/integration/sessions_helper.cc

 // Copyright (c) 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.
 
 #include "chrome/browser/sync/test/integration/sessions_helper.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <utility>
@@ skipping 50 matching lines @@
 
   if (local_session->windows.size() == 0) {
     DVLOG(1) << "Empty windows vector";
     return false;
   }
 
   int nav_index;
   sessions::SerializedNavigationEntry nav;
   for (auto it = local_session->windows.begin();
        it != local_session->windows.end(); ++it) {
-    if (it->second->tabs.size() == 0) {
+    if (it->second->wrapped_window.tabs.size() == 0) {
       DVLOG(1) << "Empty tabs vector";
       continue;
     }
-    for (auto tab_it = it->second->tabs.begin();
-         tab_it != it->second->tabs.end(); ++tab_it) {
+    for (auto tab_it = it->second->wrapped_window.tabs.begin();
+         tab_it != it->second->wrapped_window.tabs.end(); ++tab_it) {
       if ((*tab_it)->navigations.size() == 0) {
         DVLOG(1) << "Empty navigations vector";
         continue;
       }
       nav_index = (*tab_it)->current_navigation_index;
       nav = (*tab_it)->navigations[nav_index];
       if (nav.virtual_url() == url) {
         DVLOG(1) << "Found tab with url " << url.spec();
         DVLOG(1) << "Timestamp is " << nav.timestamp().ToInternalValue();
         if (nav.title().empty()) {
@@ skipping 136 matching lines @@
 
 bool GetLocalWindows(int index, ScopedWindowMap* local_windows) {
   // The local session provided by GetLocalSession is owned, and has lifetime
   // controlled, by the sessions sync manager, so we must make our own copy.
   const sync_sessions::SyncedSession* local_session;
   if (!GetLocalSession(index, &local_session)) {
     return false;
   }
   for (auto w = local_session->windows.begin();
        w != local_session->windows.end(); ++w) {
-    const sessions::SessionWindow& window = *(w->second);
-    std::unique_ptr<sessions::SessionWindow> new_window =
-        base::MakeUnique<sessions::SessionWindow>();
-    new_window->window_id.set_id(window.window_id.id());
+    const sessions::SessionWindow& window = w->second->wrapped_window;
+    std::unique_ptr<sync_sessions::SyncedSessionWindow> new_window =
+        base::MakeUnique<sync_sessions::SyncedSessionWindow>();
+    new_window->wrapped_window.window_id.set_id(window.window_id.id());
     for (size_t t = 0; t < window.tabs.size(); ++t) {
       const sessions::SessionTab& tab = *window.tabs.at(t);
       std::unique_ptr<sessions::SessionTab> new_tab =
           base::MakeUnique<sessions::SessionTab>();
       new_tab->navigations.resize(tab.navigations.size());
       std::copy(tab.navigations.begin(), tab.navigations.end(),
                 new_tab->navigations.begin());
-      new_window->tabs.push_back(std::move(new_tab));
+      new_window->wrapped_window.tabs.push_back(std::move(new_tab));
     }
-    auto id = new_window->window_id.id();
+    auto id = new_window->wrapped_window.window_id.id();
     (*local_windows)[id] = std::move(new_window);
   }
 
   return true;
 }
 
 bool CheckInitialState(int index) {
   if (0 != GetNumWindows(index))
     return false;
   if (0 != GetNumForeignSessions(index))
@@ skipping 91 matching lines @@
         << ", win2 size: "
         << win2.size();
     return false;
   }
   for (auto i = win1.begin(); i != win1.end(); ++i) {
     auto j = win2.find(i->first);
     if (j == win2.end()) {
       LOG(ERROR) << "Session doesn't match";
       return false;
     }
-    if (i->second->tabs.size() != j->second->tabs.size()) {
+    if (i->second->wrapped_window.tabs.size() !=
+        j->second->wrapped_window.tabs.size()) {
       LOG(ERROR) << "Tab size doesn't match, tab1 size: "
-          << i->second->tabs.size()
-          << ", tab2 size: "
-          << j->second->tabs.size();
+                 << i->second->wrapped_window.tabs.size()
+                 << ", tab2 size: " << j->second->wrapped_window.tabs.size();
       return false;
     }
-    for (size_t t = 0; t < i->second->tabs.size(); ++t) {
-      client0_tab = i->second->tabs[t].get();
-      client1_tab = j->second->tabs[t].get();
+    for (size_t t = 0; t < i->second->wrapped_window.tabs.size(); ++t) {
+      client0_tab = i->second->wrapped_window.tabs[t].get();
+      client1_tab = j->second->wrapped_window.tabs[t].get();
       for (size_t n = 0; n < client0_tab->navigations.size(); ++n) {
         if (!NavigationEquals(client0_tab->navigations[n],
                               client1_tab->navigations[n])) {
           return false;
         }
       }
     }
   }
 
   return true;
@@ skipping 57 matching lines @@
       index_(index),
       windows_(windows) {}
 
 bool ForeignSessionsMatchChecker::IsExitConditionSatisfied() {
   return sessions_helper::CheckForeignSessionsAgainst(index_, windows_);
 }
 
 std::string ForeignSessionsMatchChecker::GetDebugMessage() const {
   return "Waiting for matching foreign sessions";
 }