[Sync] Fix Session's handling of windows.

chrome/browser/sync/test/integration/performance/sessions_sync_perf_test.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 "base/stringprintf.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/sync/test/integration/performance/sync_timing_helper.h"
 #include "chrome/browser/sync/test/integration/sessions_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 
 using sessions_helper::GetLocalSession;
 using sessions_helper::GetSessionData;
 using sessions_helper::OpenMultipleTabs;
+using sessions_helper::SyncedSessionVector;
+using sessions_helper::SessionWindowMap;
 using sessions_helper::WaitForTabsToLoad;
 
 static const int kNumTabs = 150;
 
 class SessionsSyncPerfTest: public SyncTest {
  public:
   SessionsSyncPerfTest() : SyncTest(TWO_CLIENT), url_number_(0) {}
 
   // Opens |num_tabs| new tabs on |profile|.
   void AddTabs(int profile, int num_tabs);
@@ skipping 57 matching lines @@
 
   if (!GetSessionData(profile, &sessions)) {
     // Foreign session data may be empty.  In this case we only count tabs in
     // the local session.
     VLOG(1) << "GetSessionData returned false";
   }
 
   sessions.push_back(local_session);
   for (SyncedSessionVector::const_iterator it = sessions.begin();
        it != sessions.end(); ++it) {
-    for (SessionWindowVector::const_iterator win_it = (*it)->windows.begin();
+    for (SessionWindowMap::const_iterator win_it = (*it)->windows.begin();
          win_it != (*it)->windows.end();
          ++win_it) {
-      tab_count += (*win_it)->tabs.size();
+      tab_count += win_it->second->tabs.size();
     }
   }
   return tab_count;
 }
 
 GURL SessionsSyncPerfTest::NextURL() {
   return IntToURL(url_number_++);
 }
 
 GURL SessionsSyncPerfTest::IntToURL(int n) {
@@ skipping 17 matching lines @@
   ASSERT_EQ(kNumTabs, GetTabCount(1));
   SyncTimingHelper::PrintResult("tabs", "update_tabs", dt);
 
   RemoveTabs(0);
   dt = SyncTimingHelper::TimeMutualSyncCycle(GetClient(0), GetClient(1));
   // New tab page remains open on profile 0 after closing all tabs.
   ASSERT_EQ(1, GetTabCount(0));
   ASSERT_EQ(0, GetTabCount(1));
   SyncTimingHelper::PrintResult("tabs", "delete_tabs", dt);
 }