Sync: Refactoring of DEVICE_INFO syncable type - Part 1

chrome/browser/sync/sessions/sessions_sync_manager.h

 // Copyright 2014 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_SESSIONS_SESSIONS_SYNC_MANAGER_H_
 #define CHROME_BROWSER_SYNC_SESSIONS_SESSIONS_SYNC_MANAGER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 25 matching lines @@
 class SessionHeader;
 class SessionSpecifics;
 class SessionTab;
 class SessionWindow;
 class TabNavigation;
 }  // namespace sync_pb
 
 namespace browser_sync {
 
 class DataTypeErrorHandler;
+class LocalDeviceInfoProvider;
 class SyncedTabDelegate;
 class SyncedWindowDelegate;
 class SyncedWindowDelegatesGetter;
 
 // An interface defining the ways in which local open tab events can interact
 // with session sync.  All local tab events flow to sync via this interface.
 // In that way it is analogous to sync changes flowing to the local model
 // via ProcessSyncChanges, just with a more granular breakdown.
 class LocalSessionEventHandler {
  public:
@@ skipping 19 matching lines @@
   virtual void StartRoutingTo(LocalSessionEventHandler* handler) = 0;
   virtual void Stop() = 0;
 };
 
 // Contains all logic for associating the Chrome sessions model and
 // the sync sessions model.
 class SessionsSyncManager : public syncer::SyncableService,
                             public OpenTabsUIDelegate,
                             public LocalSessionEventHandler {
  public:
-  // Isolates SessionsSyncManager from having to depend on sync internals.
-  class SyncInternalApiDelegate {
-   public:
-    virtual ~SyncInternalApiDelegate() {}
-
-    // Returns sync's representation of the local device info.
-    // Return value is an empty scoped_ptr if the device info is unavailable.
-    virtual scoped_ptr<DeviceInfo> GetLocalDeviceInfo() const = 0;
-
-    // Used for creation of the machine tag for this local session.
-    virtual std::string GetLocalSyncCacheGUID() const = 0;
-  };
-
   SessionsSyncManager(Profile* profile,
-                      SyncInternalApiDelegate* delegate,
+                      LocalDeviceInfoProvider* local_device_info_provider,

[maniscalco, 2014/07/08 21:17:53]

local_device_info_provider must outlive this SessionsSyncManager, right?  Can
you add a comment mentioning that.

[stanisc, 2014/07/09 21:58:36]

Done.

                       scoped_ptr<LocalSessionEventRouter> router);
   virtual ~SessionsSyncManager();
 
   // syncer::SyncableService implementation.
   virtual syncer::SyncMergeResult MergeDataAndStartSyncing(
       syncer::ModelType type,
       const syncer::SyncDataList& initial_sync_data,
       scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
       scoped_ptr<syncer::SyncErrorFactory> error_handler) OVERRIDE;
   virtual void StopSyncing(syncer::ModelType type) OVERRIDE;
@@ skipping 31 matching lines @@
   }
 
   // Return the virtual URL of the current tab, even if it's pending.
   static GURL GetCurrentVirtualURL(const SyncedTabDelegate& tab_delegate);
 
   // Return the favicon url of the current tab, even if it's pending.
   static GURL GetCurrentFaviconURL(const SyncedTabDelegate& tab_delegate);
 
   FaviconCache* GetFaviconCache();
 
+  SyncedWindowDelegatesGetter* GetSyncedWindowDelegatesGetter() const;
+
   // Triggers garbage collection of stale sessions (as defined by
   // |stale_session_threshold_days_|). This is called automatically every
   // time we start up (via AssociateModels) and when new sessions data is
   // downloaded (sync cycles complete).
   void DoGarbageCollection();
 
  private:
   // Keep all the links to local tab data in one place. A tab_node_id and tab
   // must be passed at creation. The tab_node_id is not mutable, although
   // all other fields are.
@@ skipping 186 matching lines @@
   // proves that we are still relevant.
   bool local_tab_pool_out_of_sync_;
 
   sync_driver::SyncPrefs sync_prefs_;
 
   const Profile* const profile_;
 
   scoped_ptr<syncer::SyncErrorFactory> error_handler_;
   scoped_ptr<syncer::SyncChangeProcessor> sync_processor_;
 
-  const SyncInternalApiDelegate* const delegate_;
+  const LocalDeviceInfoProvider* const local_device_info_provider_;
 
   // Unique client tag.
   std::string current_machine_tag_;
 
   // User-visible machine name.
   std::string current_session_name_;
 
   // SyncID for the sync node containing all the window information for this
   // client.
   int local_session_header_node_id_;
 
   // Number of days without activity after which we consider a session to be
   // stale and a candidate for garbage collection.
   size_t stale_session_threshold_days_;
 
   scoped_ptr<LocalSessionEventRouter> local_event_router_;
   scoped_ptr<SyncedWindowDelegatesGetter> synced_window_getter_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionsSyncManager);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_SESSIONS_SESSIONS_SYNC_MANAGER_H_