[Sync] Fix Session's handling of windows.

chrome/browser/ui/webui/ntp/foreign_session_handler.cc

 // Copyright (c) 2011 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/ui/webui/ntp/foreign_session_handler.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 #include "base/memory/scoped_vector.h"
@@ skipping 90 matching lines @@
         "SessionModelAssociator.";
     return;
   }
   int added_count = 0;
   ListValue session_list;
   for (std::vector<const SyncedSession*>::const_iterator i =
       sessions.begin(); i != sessions.end() &&
       added_count < kMaxSessionsToShow; ++i) {
     const SyncedSession* foreign_session = *i;
     scoped_ptr<ListValue> window_list(new ListValue());
-    for (std::vector<SessionWindow*>::const_iterator it =
+    for (SyncedSession::SyncedWindowMap::const_iterator it =
         foreign_session->windows.begin(); it != foreign_session->windows.end();
         ++it) {
-      SessionWindow* window = *it;
+      SessionWindow* window = it->second;
       scoped_ptr<DictionaryValue> window_data(new DictionaryValue());
       if (SessionWindowToValue(*window, window_data.get())) {
         window_data->SetString("sessionTag", foreign_session->session_tag);
 
         // Give ownership to |list_value|.
         window_list->Append(window_data.release());
       }
     }
     added_count++;
 
@@ skipping 43 matching lines @@
   if (tab_id != kInvalidId) {
     // We don't actually care about |window_num|, this is just a sanity check.
     DCHECK_LT(kInvalidId, window_num);
     const SessionTab* tab;
     if (!associator->GetForeignTab(session_string_value, tab_id, &tab)) {
       LOG(ERROR) << "Failed to load foreign tab.";
       return;
     }
     SessionRestore::RestoreForeignSessionTab(profile, *tab);
   } else {
-    std::vector<SessionWindow*> windows;
+    std::vector<const SessionWindow*> windows;
     // Note: we don't own the ForeignSessions themselves.
     if (!associator->GetForeignSession(session_string_value, &windows)) {
       LOG(ERROR) << "ForeignSessionHandler failed to get session data from"
           "SessionModelAssociator.";
       return;
     }
-    std::vector<SessionWindow*>::const_iterator iter_begin = windows.begin() +
-        ((window_num == kInvalidId) ? 0 : window_num);
-    std::vector<SessionWindow*>::const_iterator iter_end =
+    std::vector<const SessionWindow*>::const_iterator iter_begin =
+        windows.begin() + ((window_num == kInvalidId) ? 0 : window_num);
+    std::vector<const SessionWindow*>::const_iterator iter_end =
         ((window_num == kInvalidId) ?
-        std::vector<SessionWindow*>::const_iterator(windows.end()) :
+        std::vector<const SessionWindow*>::const_iterator(windows.end()) :
         iter_begin + 1);
     SessionRestore::RestoreForeignSessionWindows(profile, iter_begin, iter_end);
   }
 }
 
 bool ForeignSessionHandler::SessionTabToValue(
     const SessionTab& tab,
     DictionaryValue* dictionary) {
   if (tab.navigations.empty())
     return false;
@@ skipping 32 matching lines @@
     return false;
   dictionary->SetString("type", "window");
   dictionary->SetDouble("timestamp",
       static_cast<double>(window.timestamp.ToInternalValue()));
   dictionary->SetInteger("sessionId", window.window_id.id());
   dictionary->Set("tabs", tab_values.release());
   return true;
 }
 
 }  // namespace browser_sync