Refactor preference syncing.

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 31 matching lines @@
 class SessionSpecifics;
 }  // namespace sync_pb
 
 namespace browser_sync {
 
 static const char kSessionsTag[] = "google_chrome_sessions";
 
 // Contains all logic for associating the Chrome sessions model and
 // the sync sessions model.
 class SessionModelAssociator
-    : public PerDataTypeAssociatorInterface<TabContents, size_t>,
+    : public NewAssociatorInterface,
       public base::NonThreadSafe {
  public:
   // Does not take ownership of sync_service.
   explicit SessionModelAssociator(ProfileSyncService* sync_service);
   SessionModelAssociator(ProfileSyncService* sync_service,
                          bool setup_for_test);
-  virtual ~SessionModelAssociator();
 
   // The has_nodes out parameter is set to true if the sync model has
   // nodes other than the permanent tagged nodes.  The method may
   // return false if an error occurred.
   virtual bool SyncModelHasUserCreatedNodes(bool* has_nodes);
 
   // AssociatorInterface and PerDataTypeAssociator Interface implementation.
   virtual void AbortAssociation() {
     // No implementation needed, this associator runs on the main thread.
   }
@@ skipping 94 matching lines @@
 
   // 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 TabContents& 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);
-
-  // Returns the syncable model type.
-  static syncable::ModelType model_type() { return syncable::SESSIONS; }
-
  private:
   FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceSessionTest, WriteSessionToNode);
   FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceSessionTest,
                            WriteFilledSessionToNode);
   FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceSessionTest,
                            WriteForeignSessionToNode);
   FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceSessionTest, TabNodePoolEmpty);
   FRIEND_TEST_ALL_PREFIXES(ProfileSyncServiceSessionTest, TabNodePoolNonEmpty);
   FRIEND_TEST_ALL_PREFIXES(SessionModelAssociatorTest, PopulateSessionWindow);
   FRIEND_TEST_ALL_PREFIXES(SessionModelAssociatorTest, PopulateSessionTab);
 
+  virtual ~SessionModelAssociator();
+
   // Keep all the links to local tab data in one place.
   class TabLinks {
    public:
     // To support usage as second value in maps we need default and copy
     // constructors.
     TabLinks()
         : sync_id_(0),
           session_tab_(NULL),
           tab_(NULL) {}
 
@@ skipping 209 matching lines @@
 
   // To avoid certain checks not applicable to tests.
   bool setup_for_test_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionModelAssociator);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_