[Sync] Introduce SyncedSessionWindow type.

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

 // 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.
 
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/test/histogram_tester.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/sync/sessions/sync_sessions_router_tab_helper.h"
@@ skipping 59 matching lines @@
 }  // namespace
 
 class SingleClientSessionsSyncTest : public SyncTest {
  public:
   SingleClientSessionsSyncTest() : SyncTest(SINGLE_CLIENT) {}
   ~SingleClientSessionsSyncTest() override {}
 
   void ExpectNavigationChain(const std::vector<GURL>& urls) {
     ScopedWindowMap windows;
     ASSERT_TRUE(GetLocalWindows(0, &windows));
-    ASSERT_EQ(windows.begin()->second->tabs.size(), 1u);
-    sessions::SessionTab* tab = windows.begin()->second->tabs[0].get();
+    ASSERT_EQ(windows.begin()->second->wrapped_window.tabs.size(), 1u);
+    sessions::SessionTab* tab =
+        windows.begin()->second->wrapped_window.tabs[0].get();
 
     int index = 0;
     EXPECT_EQ(urls.size(), tab->navigations.size());
     for (auto it = tab->navigations.begin(); it != tab->navigations.end();
          ++it, ++index) {
       EXPECT_EQ(urls[index], it->virtual_url());
     }
   }
 
   // Block until the expected hierarchy is recorded on the FakeServer for
@@ skipping 62 matching lines @@
   ASSERT_TRUE(CheckInitialState(0));
 
   const GURL url(kURL1);
 
   ScopedWindowMap windows;
   ASSERT_TRUE(OpenTab(0, url));
   ASSERT_TRUE(GetLocalWindows(0, &windows));
 
   int found_navigations = 0;
   for (auto it = windows.begin(); it != windows.end(); ++it) {
-    for (auto it2 = it->second->tabs.begin(); it2 != it->second->tabs.end();
-         ++it2) {
+    for (auto it2 = it->second->wrapped_window.tabs.begin();
+         it2 != it->second->wrapped_window.tabs.end(); ++it2) {
       for (auto it3 = (*it2)->navigations.begin();
            it3 != (*it2)->navigations.end(); ++it3) {
         const base::Time timestamp = it3->timestamp();
 
         history::URLRow virtual_row;
         ASSERT_TRUE(GetUrlFromClient(0, it3->virtual_url(), &virtual_row));
         const base::Time history_timestamp = virtual_row.last_visit();
 
         ASSERT_EQ(timestamp, history_timestamp);
         ++found_navigations;
       }
     }
   }
   ASSERT_EQ(1, found_navigations);
 }
 
 IN_PROC_BROWSER_TEST_F(SingleClientSessionsSyncTest, ResponseCodeIsPreserved) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   ASSERT_TRUE(CheckInitialState(0));
 
   const GURL url(kURL1);
   ScopedWindowMap windows;
   ASSERT_TRUE(OpenTab(0, url));
   ASSERT_TRUE(GetLocalWindows(0, &windows));
 
   int found_navigations = 0;
   for (auto it = windows.begin(); it != windows.end(); ++it) {
-    for (auto it2 = it->second->tabs.begin(); it2 != it->second->tabs.end();
-         ++it2) {
+    for (auto it2 = it->second->wrapped_window.tabs.begin();
+         it2 != it->second->wrapped_window.tabs.end(); ++it2) {
       for (auto it3 = (*it2)->navigations.begin();
            it3 != (*it2)->navigations.end(); ++it3) {
         EXPECT_EQ(200, it3->http_status_code());
         ++found_navigations;
       }
     }
   }
   ASSERT_EQ(1, found_navigations);
 }
 
@@ skipping 216 matching lines @@
     // Verify the cookie jar mismatch bool is set to false.
     ASSERT_TRUE(GetFakeServer()->GetLastCommitMessage(&message));
     ASSERT_FALSE(message.commit().config_params().cookie_jar_mismatch());
 
     // Verify the histograms were recorded properly.
     ExpectUniqueSampleGE(histogram_tester, "Sync.CookieJarMatchOnNavigation",
                          true, 1);
     histogram_tester.ExpectTotalCount("Sync.CookieJarEmptyOnMismatch", 0);
   }
 }