NOT FOR COMMIT: Add DeviceInfo type and ChangeProcessor

chrome/browser/sync/glue/session_model_associator.h

 // Copyright (c) 2012 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_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 25 matching lines @@
 class ProfileSyncService;
 
 namespace content {
 class NavigationEntry;
 }  // namespace content
 
 namespace syncer {
 class BaseTransaction;
 class ReadNode;
 class WriteTransaction;
+struct UserShare;
 }  // namespace syncer
 
 namespace sync_pb {
 class SessionHeader;
 class SessionSpecifics;
 class SessionTab;
 class SessionWindow;
 class TabNavigation;
 }  // namespace sync_pb
 
@@ skipping 323 matching lines @@
   static bool ShouldSyncWindow(const SyncedWindowDelegate* window);
 
   // Build a sync tag from tab_node_id.
   static std::string TabIdToTag(
       const std::string machine_tag,
       size_t tab_node_id) {
     return base::StringPrintf("%s %"PRIuS"", machine_tag.c_str(), tab_node_id);
   }
 
   // Initializes the tag corresponding to this machine.
-  void InitializeCurrentMachineTag(syncer::WriteTransaction* trans);
+  void InitializeCurrentMachineTag(syncer::UserShare* share);
 
   // Initializes the user visible name for this session
   void InitializeCurrentSessionName();
 
   // Updates the server data based upon the current client session.  If no node
   // corresponding to this machine exists in the sync model, one is created.
   // Returns true on success, false if association failed.
   bool UpdateSyncModelDataFromClient(syncer::SyncError* error);
 
   // Pulls the current sync model from the sync database and returns true upon
@@ skipping 159 matching lines @@
   std::map<std::string, linked_ptr<SyncedFaviconInfo> > synced_favicons_;
   // Map of page URL -> favicon url.
   std::map<std::string, std::string> synced_favicon_pages_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionModelAssociator);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_