sync: hook up ServerConnectionManager <> SyncerThread2 and tie up more loose ends

chrome/browser/sync/engine/net/server_connection_manager.h

 // Copyright (c) 2010 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_ENGINE_NET_SERVER_CONNECTION_MANAGER_H_
 #define CHROME_BROWSER_SYNC_ENGINE_NET_SERVER_CONNECTION_MANAGER_H_
 #pragma once
 
 #include <iosfwd>
 #include <string>
 
 #include "base/atomicops.h"
+#include "base/observer_list_threadsafe.h"
 #include "base/string_util.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/sync/syncable/syncable_id.h"
 #include "chrome/common/deprecated/event_sys.h"
 #include "chrome/common/deprecated/event_sys-inl.h"
 #include "chrome/common/net/http_return.h"
 
 namespace syncable {
 class WriteTransaction;
 class DirectoryManager;
@@ skipping 77 matching lines @@
       : response_code(kUnsetResponseCode),
         content_length(kUnsetContentLength),
         payload_length(kUnsetPayloadLength),
         server_status(NONE) {}
 };
 
 inline bool IsGoodReplyFromServer(HttpResponse::ServerConnectionCode code) {
   return code >= HttpResponse::SERVER_CONNECTION_OK;
 }
 
+// TODO(tim): Deprecated.
 struct ServerConnectionEvent {
   // Traits.
   typedef ServerConnectionEvent EventType;
   enum WhatHappened {
     SHUTDOWN,
     STATUS_CHANGED
   };
 
   static inline bool IsChannelShutdownEvent(const EventType& event) {
     return SHUTDOWN == event.what_happened;
   }
 
   WhatHappened what_happened;
   HttpResponse::ServerConnectionCode connection_code;
   bool server_reachable;
 };
 
+struct ServerConnectionEvent2 {
+  HttpResponse::ServerConnectionCode connection_code;
+  bool server_reachable;
+  ServerConnectionEvent2(HttpResponse::ServerConnectionCode code,
+                         bool server_reachable) :
+      connection_code(code), server_reachable(server_reachable) {}
+};
+
+class ServerConnectionEventListener {
+ public:
+  virtual void OnServerConnectionEvent(const ServerConnectionEvent2& event) = 0;
+ protected:
+  virtual ~ServerConnectionEventListener() {}
+};
+
 class ServerConnectionManager;
 // A helper class that automatically notifies when the status changes.
 // TODO(tim): This class shouldn't be exposed outside of the implementation,
 // bug 35060.
 class ScopedServerStatusWatcher {
  public:
   ScopedServerStatusWatcher(ServerConnectionManager* conn_mgr,
                             HttpResponse* response);
   ~ScopedServerStatusWatcher();
  private:
@@ skipping 96 matching lines @@
   virtual bool IsUserAuthenticated();
 
   // Updates status and broadcasts events on change.
   bool CheckServerReachable();
 
   // Signal the shutdown event to notify listeners.
   virtual void kill();
 
   inline Channel* channel() const { return channel_; }
 
+  void AddListener(ServerConnectionEventListener* listener);
+  void RemoveListener(ServerConnectionEventListener* listener);
+
   inline std::string user_agent() const { return user_agent_; }
 
   inline HttpResponse::ServerConnectionCode server_status() const {
     return server_status_;
   }
 
   inline bool server_reachable() const { return server_reachable_; }
 
   const std::string client_id() const { return client_id_; }
 
@@ skipping 84 matching lines @@
   std::string proto_sync_path_;
   std::string get_time_path_;
 
   mutable base::Lock auth_token_mutex_;
   // The auth token to use in authenticated requests. Set by the AuthWatcher.
   std::string auth_token_;
 
   base::Lock error_count_mutex_;  // Protects error_count_
   int error_count_;  // Tracks the number of connection errors.
 
+  // TODO(tim): Deprecated.
   Channel* const channel_;
 
+  scoped_refptr<ObserverListThreadSafe<ServerConnectionEventListener> >
+     listeners_;
+
   // Volatile so various threads can call server_status() without
   // synchronization.
   volatile HttpResponse::ServerConnectionCode server_status_;
   bool server_reachable_;
 
   // A counter that is incremented everytime ResetAuthStatus() is called.
   volatile base::subtle::AtomicWord reset_count_;
 
  private:
   friend class Post;
@@ skipping 11 matching lines @@
 // settings.
 bool FillMessageWithShareDetails(sync_pb::ClientToServerMessage* csm,
                                  syncable::DirectoryManager* manager,
                                  const std::string& share);
 
 std::ostream& operator<<(std::ostream& s, const struct HttpResponse& hr);
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_ENGINE_NET_SERVER_CONNECTION_MANAGER_H_