1 files changed, 12 insertions, 7 deletions
diff --git a/chrome/browser/sync/sessions/sync_session_context.h b/chrome/browser/sync/sessions/sync_session_context.h
index bc4ea28..4c6b63f 100644
--- a/chrome/browser/sync/sessions/sync_session_context.h
+++ b/chrome/browser/sync/sessions/sync_session_context.h
@@ -17,6 +17,7 @@
 
 #ifndef CHROME_BROWSER_SYNC_SESSIONS_SYNC_SESSION_CONTEXT_H_
 #define CHROME_BROWSER_SYNC_SESSIONS_SYNC_SESSION_CONTEXT_H_
+#pragma once
 
 #include <string>
 #include "chrome/browser/chrome_thread.h"
@@ -30,7 +31,6 @@ class DirectoryManager;
 
 namespace browser_sync {
 
-class AuthWatcher;
 class ConflictResolver;
 class ModelSafeWorkerRegistrar;
 class ServerConnectionManager;
@@ -42,13 +42,11 @@ class ScopedSessionContextSyncerEventChannel;
 class SyncSessionContext {
  public:
   SyncSessionContext(ServerConnectionManager* connection_manager,
-                     AuthWatcher* auth_watcher,
                      syncable::DirectoryManager* directory_manager,
                      ModelSafeWorkerRegistrar* model_safe_worker_registrar)
       : resolver_(NULL),
         syncer_event_channel_(NULL),
         connection_manager_(connection_manager),
-        auth_watcher_(auth_watcher),
         directory_manager_(directory_manager),
         registrar_(model_safe_worker_registrar),
         extensions_activity_monitor_(new ExtensionsActivityMonitor()),
@@ -67,9 +65,6 @@ class SyncSessionContext {
   ServerConnectionManager* connection_manager() {
     return connection_manager_;
   }
-  AuthWatcher* auth_watcher() {
-    return auth_watcher_;
-  }
   syncable::DirectoryManager* directory_manager() {
     return directory_manager_;
   }
@@ -104,6 +99,14 @@ class SyncSessionContext {
     previous_session_routing_info_ = info;
   }
 
+  sessions::SyncSessionSnapshot* previous_session_snapshot() {
+    return previous_session_snapshot_.get();
+  }
+
+  void set_last_snapshot(const SyncSessionSnapshot& snapshot) {
+    previous_session_snapshot_.reset(new SyncSessionSnapshot(snapshot));
+  }
+
  private:
   // Rather than force clients to set and null-out various context members, we
   // extend our encapsulation boundary to scoped helpers that take care of this
@@ -116,7 +119,6 @@ class SyncSessionContext {
   SyncerEventChannel* syncer_event_channel_;
 
   ServerConnectionManager* const connection_manager_;
-  AuthWatcher* const auth_watcher_;
   syncable::DirectoryManager* const directory_manager_;
 
   // A registrar of workers capable of processing work closures on a thread
@@ -138,6 +140,9 @@ class SyncSessionContext {
   // by the user.
   ModelSafeRoutingInfo previous_session_routing_info_;
 
+  // Cache of last session snapshot information.
+  scoped_ptr<sessions::SyncSessionSnapshot> previous_session_snapshot_;
+
   DISALLOW_COPY_AND_ASSIGN(SyncSessionContext);
 };