Replace more ObserverList with base::ObserverList.

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.  Unlike the SyncSession, the context
 // can be reused across several sync cycles.
 //
 // The context does not take ownership of its pointer members.  It's up to
 // the surrounding classes to ensure those members remain valid while the
@@ skipping 72 matching lines @@
     DCHECK(account_name_.empty());
     account_name_ = name;
   }
   const std::string& account_name() const { return account_name_; }
 
   void set_max_commit_batch_size(int batch_size) {
     max_commit_batch_size_ = batch_size;
   }
   int32 max_commit_batch_size() const { return max_commit_batch_size_; }
 
-  ObserverList<SyncEngineEventListener>* listeners() {
+  base::ObserverList<SyncEngineEventListener>* listeners() {
     return &listeners_;
   }
 
   bool keystore_encryption_enabled() const {
     return keystore_encryption_enabled_;
   }
 
   void set_hierarchy_conflict_detected(bool value) {
     client_status_.set_hierarchy_conflict_detected(value);
   }
@@ skipping 18 matching lines @@
   ModelTypeRegistry* model_type_registry() {
     return model_type_registry_;
   }
 
  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
   // once they are allocated. See definitions of these below.
   friend class TestScopedSessionEventListener;
 
-  ObserverList<SyncEngineEventListener> listeners_;
+  base::ObserverList<SyncEngineEventListener> listeners_;
 
   ServerConnectionManager* const connection_manager_;
   syncable::Directory* const directory_;
 
   // We use this to stuff extensions activity into CommitMessages so the server
   // can correlate commit traffic with extension-related bookmark mutations.
   scoped_refptr<ExtensionsActivity> extensions_activity_;
 
   // Kept up to date with talk events to determine whether notifications are
   // enabled. True only if the notification channel is authorized and open.
@@ skipping 34 matching lines @@
   // enable the pre-commit update avoidance experiment described above.
   const bool client_enabled_pre_commit_update_avoidance_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncSessionContext);
 };
 
 }  // namespace sessions
 }  // namespace syncer
 
 #endif  // SYNC_SESSIONS_SYNC_SESSION_CONTEXT_H_