[Sync] Fix Session's handling of windows.

chrome/browser/sync/glue/session_model_associator.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_
 #define CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 139 matching lines @@
   // local machine. Used primarily for testing.
   bool GetLocalSession(const SyncedSession* * local_session);
 
   // Builds a list of all foreign sessions.
   // Caller does NOT own ForeignSession objects.
   bool GetAllForeignSessions(std::vector<const SyncedSession*>* sessions);
 
   // Loads all windows for foreign session with session tag |tag|.
   // Caller does NOT own SyncedSession objects.
   bool GetForeignSession(const std::string& tag,
-                         std::vector<SessionWindow*>* windows);
+                         std::vector<const SessionWindow*>* windows);
 
   // Looks up the foreign tab identified by |tab_id| and belonging to foreign
   // session |tag|.
   // Caller does NOT own the SessionTab object.
   bool GetForeignTab(const std::string& tag,
                      const SessionID::id_type tab_id,
                      const SessionTab** tab);
 
-  // Specifies whether the window has tabs to sync. The new tab page does not
-  // count. If no tabs to sync, it returns true, otherwise false;
-  static bool SessionWindowHasNoTabsToSync(const SessionWindow& window);
-
   // Control which local tabs we're interested in syncing.
   // Ensures the profile matches sync's profile and that the tab has at least
   // one navigation entry and is not an empty tab.
-  bool IsValidTab(const SyncedTabDelegate& tab);
-
-  // Control which foreign tabs we're interested in displaying.
-  // Checks that the tab has navigations and is not a new tab.
-  // Note: a new tab page with back/forward history is valid.
-  static bool IsValidSessionTab(const SessionTab& tab);
+  bool IsValidTab(const SyncedTabDelegate& tab) const;
 
   // Returns the syncable model type.
   static syncable::ModelType model_type() { return syncable::SESSIONS; }
 
   // Testing only. Will cause the associator to call MessageLoop::Quit()
   // when a local change is made, or when timeout_milli occurs, whichever is
   // first.
   void BlockUntilLocalChangeForTest(int64 timeout_milli);
 
   // Callback for when the session name has been computed.
@@ skipping 267 matching lines @@
   // is made.
   bool waiting_for_change_;
   ScopedRunnableMethodFactory<SessionModelAssociator> test_method_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionModelAssociator);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_