[Sync] Introduce SyncedSessionWindow type.

components/ntp_snippets/sessions/foreign_sessions_suggestions_provider_unittest.cc

 // Copyright 2016 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 "components/ntp_snippets/sessions/foreign_sessions_suggestions_provider.h"
 
 #include <map>
 #include <utility>
 
 #include "base/callback_forward.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "components/ntp_snippets/category.h"
 #include "components/ntp_snippets/content_suggestions_provider.h"
 #include "components/ntp_snippets/mock_content_suggestions_provider_observer.h"
 #include "components/prefs/testing_pref_service.h"
 #include "components/sessions/core/serialized_navigation_entry.h"
 #include "components/sessions/core/serialized_navigation_entry_test_helper.h"
 #include "components/sessions/core/session_types.h"
 #include "components/sync_sessions/synced_session.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
 using base::TimeDelta;
 using sessions::SerializedNavigationEntry;
 using sessions::SessionTab;
 using sessions::SessionWindow;
 using sync_sessions::SyncedSession;
+using sync_sessions::SyncedSessionWindow;
 using testing::ElementsAre;
 using testing::IsEmpty;
 using testing::Property;
 using testing::Test;
 using testing::_;
 
 namespace ntp_snippets {
 namespace {
 
 const char kUrl1[] = "http://www.fake1.com/";
 const char kUrl2[] = "http://www.fake2.com/";
 const char kUrl3[] = "http://www.fake3.com/";
 const char kUrl4[] = "http://www.fake4.com/";
 const char kUrl5[] = "http://www.fake5.com/";
 const char kUrl6[] = "http://www.fake6.com/";
 const char kUrl7[] = "http://www.fake7.com/";
 const char kUrl8[] = "http://www.fake8.com/";
 const char kUrl9[] = "http://www.fake9.com/";
 const char kUrl10[] = "http://www.fake10.com/";
 const char kUrl11[] = "http://www.fake11.com/";
 const char kTitle[] = "title is ignored";
 
 SessionWindow* GetOrCreateWindow(SyncedSession* session, int window_id) {
   if (session->windows.find(window_id) == session->windows.end()) {
-    session->windows[window_id] = base::MakeUnique<SessionWindow>();
+    session->windows[window_id] = base::MakeUnique<SyncedSessionWindow>();
   }
 
-  return session->windows[window_id].get();
+  return &session->windows[window_id]->wrapped_window;
 }
 
 void AddTabToSession(SyncedSession* session,
                      int window_id,
                      const std::string& url,
                      TimeDelta age) {
   SerializedNavigationEntry navigation =
       sessions::SerializedNavigationEntryTestHelper::CreateNavigation(url,
                                                                       kTitle);
 
@@ skipping 298 matching lines @@
   EXPECT_CALL(*observer(),
               OnNewSuggestions(
                   _, category(),
                   ElementsAre(Property(&ContentSuggestion::url, GURL(kUrl1)),
                               Property(&ContentSuggestion::url, GURL(kUrl2)))));
   AddTab(0, 0, kUrl2, TimeDelta::FromMinutes(2));
   TriggerOnChange();
 }
 
 }  // namespace ntp_snippets