[Sync] Fix Session's handling of windows.

chrome/browser/sync/glue/synced_session.h

Index: chrome/browser/sync/glue/synced_session.h
diff --git a/chrome/browser/sync/glue/synced_session.h b/chrome/browser/sync/glue/synced_session.h
index 00f956b9be79c900ec746fa40be37e7f9420a764..ec8e5137bb6794d8a88ff92a344b46c0caefc7bf 100644
--- a/chrome/browser/sync/glue/synced_session.h
+++ b/chrome/browser/sync/glue/synced_session.h
@@ -6,8 +6,10 @@
 #define CHROME_BROWSER_SYNC_GLUE_SYNCED_SESSION_H_
 #pragma once
 
+#include <map>
 #include <string>
-#include <vector>
+
+#include "chrome/browser/sessions/session_id.h"
 
 struct SessionWindow;
 
@@ -17,6 +19,8 @@ namespace browser_sync {
 // list of windows along with a unique session identifer (tag) and meta-data
 // about the device being synced.
 struct SyncedSession {
+  typedef std::map<SessionID::id_type, SessionWindow*> SyncedWindowMap;
+
   // The type of device.
   enum DeviceType {
     TYPE_UNSET = 0,
@@ -35,7 +39,7 @@ struct SyncedSession {
   // User-visible name
   std::string session_name;
   DeviceType device_type;
-  std::vector<SessionWindow*> windows;
+  SyncedWindowMap windows;

[akalin, 2011/09/26 18:34:44]

Add a comment saying that the SessionWindow*s are owned

[Nicolas Zea, 2011/09/26 19:47:36]

Done.

 };

[akalin, 2011/09/26 18:34:44]

DISALLOW_COPY_AND_ASSIGN()?  Seems like things will break if you allow this to
be copied (double-frees of SessionWindow*, etc)

Alternatively, make SyncedWindowMap have linked_ptr<SessionWindow>

[Nicolas Zea, 2011/09/26 19:47:36]

Done.

 
 }  // namespace browser_sync