Worker changes to prepare for lock-free shutdown.

sync/sessions/sync_session_context.h

 // Copyright 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.
 
 // SyncSessionContext encapsulates the contextual information and engine
 // components specific to a SyncSession. A context is accessible via
 // a SyncSession so that session SyncerCommands and parts of the engine have
 // a convenient way to access other parts. In this way it can be thought of as
 // the surrounding environment for the SyncSession. The components of this
 // environment are either valid or not valid for the entire context lifetime,
@@ skipping 58 matching lines @@
   }
 
   const ModelSafeRoutingInfo& routing_info() const {
     return routing_info_;
   }
 
   void set_routing_info(const ModelSafeRoutingInfo& routing_info) {
     routing_info_ = routing_info;
   }
 
-  const std::vector<ModelSafeWorker*> workers() const {
+  const std::vector<scoped_refptr<ModelSafeWorker> >& workers() const {
     return workers_;
   }
 
   ExtensionsActivityMonitor* extensions_monitor() {
     return extensions_activity_monitor_;
   }
 
   ThrottledDataTypeTracker* throttled_data_type_tracker() {
     return throttled_data_type_tracker_;
   }
@@ skipping 54 matching lines @@
   ObserverList<SyncEngineEventListener> listeners_;
 
   ServerConnectionManager* const connection_manager_;
   syncable::Directory* const directory_;
 
   // A cached copy of SyncBackendRegistrar's routing info.
   // Must be updated manually when SBR's state is modified.
   ModelSafeRoutingInfo routing_info_;
 
   // The set of ModelSafeWorkers.  Used to execute tasks of various threads.
-  const std::vector<ModelSafeWorker*> workers_;
+  std::vector<scoped_refptr<ModelSafeWorker> > workers_;
 
   // We use this to stuff extensions activity into CommitMessages so the server
   // can correlate commit traffic with extension-related bookmark mutations.
   ExtensionsActivityMonitor* extensions_activity_monitor_;
 
   // Kept up to date with talk events to determine whether notifications are
   // enabled. True only if the notification channel is authorized and open.
   bool notifications_enabled_;
 
   // The name of the account being synced.
@@ skipping 24 matching lines @@
   // prevent us from receiving notifications of changes we make ourselves.
   const std::string invalidator_client_id_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncSessionContext);
 };
 
 }  // namespace sessions
 }  // namespace syncer
 
 #endif  // SYNC_SESSIONS_SYNC_SESSION_CONTEXT_H_