[Sync] Componentize synced_tab_delegate

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 31 matching lines @@
 class SessionSpecifics;
 class SessionTab;
 class SessionWindow;
 class TabNavigation;
 }  // namespace sync_pb
 
 namespace browser_sync {
 
 class DataTypeErrorHandler;
 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:
   // A local navigation event took place that affects the synced session
   // for this instance of Chrome.
@@ skipping 18 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 sync_driver::OpenTabsUIDelegate,
                             public LocalSessionEventHandler {
  public:
-  SessionsSyncManager(
-      Profile* profile,
-      sync_driver::LocalDeviceInfoProvider* local_device,
-      scoped_ptr<LocalSessionEventRouter> router,
-      scoped_ptr<SyncedWindowDelegatesGetter> synced_window_getter);
+  SessionsSyncManager(sync_sessions::SyncSessionsClient* sessions_client,
+                      Profile* profile,
+                      sync_driver::LocalDeviceInfoProvider* local_device,
+                      scoped_ptr<LocalSessionEventRouter> router);
   ~SessionsSyncManager() override;
 
   // syncer::SyncableService implementation.
   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;
   void StopSyncing(syncer::ModelType type) override;
   syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override;
@@ skipping 26 matching lines @@
                          const GURL& icon_url) override;
 
   // Returns the tag used to uniquely identify this machine's session in the
   // sync model.
   const std::string& current_machine_tag() const {
     DCHECK(!current_machine_tag_.empty());
     return current_machine_tag_;
   }
 
   // Return the virtual URL of the current tab, even if it's pending.
   static GURL GetCurrentVirtualURL(const SyncedTabDelegate& tab_delegate);

[sdefresne, 2015/10/28 10:45:46]

I think you forgot to remove this method declaration when removing the
implementation.

 
   // Return the favicon url of the current tab, even if it's pending.
   static GURL GetCurrentFaviconURL(const SyncedTabDelegate& tab_delegate);

[sdefresne, 2015/10/28 10:45:46]

Same here.

 
   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();
@@ skipping 142 matching lines @@
 
   // Loads and reassociates the local tabs referenced in |tabs|.
   // |change_output| *must* be provided as a link to the SyncChange pipeline
   // that exists in the caller's context. This function will append necessary
   // changes for processing later.
   void AssociateTab(SyncedTabDelegate* const tab,
                     syncer::SyncChangeList* change_output);
 
   // Set |session_tab| from |tab_delegate| and |mtime|.
   static void SetSessionTabFromDelegate(
+      SyncedWindowDelegatesGetter* synced_window_getter,
       const SyncedTabDelegate& tab_delegate,
       base::Time mtime,
       sessions::SessionTab* session_tab);
 
   // Sets |variation_ids| field of |session_tab| with the ids of the currently
   // assigned variations which should be sent to sync.
   static void SetVariationIds(sessions::SessionTab* session_tab);
 
   // Populates |specifics| based on the data in |tab_delegate|.
   void LocalTabDelegateToSpecifics(const SyncedTabDelegate& tab_delegate,
@@ skipping 18 matching lines @@
       syncer::SyncChangeList* change_output);
 
   // Stops and re-starts syncing to rebuild association mappings.
   // See |local_tab_pool_out_of_sync_|.
   void RebuildAssociations();
 
   // Validates the content of a SessionHeader protobuf.
   // Returns false if validation fails.
   static bool IsValidSessionHeader(const sync_pb::SessionHeader& header);
 
+  // The client of this sync sessions datatype.
+  sync_sessions::SyncSessionsClient* const sessions_client_;
+
   // Mapping of current open (local) tabs to their sync identifiers.
   TabLinksMap local_tab_map_;
 
   SyncedSessionTracker session_tracker_;
   FaviconCache favicon_cache_;
 
   // Pool of used/available sync nodes associated with local tabs.
   TabNodePool local_tab_pool_;
 
   // Tracks whether our local representation of which sync nodes map to what
@@ skipping 23 matching lines @@
 
   // 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_;
+  SyncedWindowDelegatesGetter* synced_window_getter_;
 
   // Owns revisiting instrumentation logic for page visit events.
   PageRevisitBroadcaster page_revisit_broadcaster_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionsSyncManager);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_SESSIONS_SESSIONS_SYNC_MANAGER_H_