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

chrome/test/sync/engine/mock_connection_manager.cc

Index: chrome/test/sync/engine/mock_connection_manager.cc
diff --git a/chrome/test/sync/engine/mock_connection_manager.cc b/chrome/test/sync/engine/mock_connection_manager.cc
index e4578fe7b02b88ec6c3de7fd6ffad7adbdb9f329..7d3c5fe21fc3391b82758efe9c8a872e89a9f814 100644
--- a/chrome/test/sync/engine/mock_connection_manager.cc
+++ b/chrome/test/sync/engine/mock_connection_manager.cc
@@ -15,6 +15,8 @@
 
 using browser_sync::HttpResponse;
 using browser_sync::ServerConnectionManager;
+using browser_sync::ServerConnectionEventListener;
+using browser_sync::ServerConnectionEvent2;
 using browser_sync::SyncerProtoUtil;
 using browser_sync::TestIdFactory;
 using std::map;
@@ -608,7 +610,10 @@ void MockConnectionManager::SetServerReachable() {
     browser_sync::ServerConnectionEvent::STATUS_CHANGED,
     server_status_,
     server_reachable_ };
+
   channel_->NotifyListeners(event);
+  listeners_->Notify(&ServerConnectionEventListener::OnServerConnectionEvent,
+      ServerConnectionEvent2(server_status_, server_reachable_));
 }
 
 void MockConnectionManager::SetServerNotReachable() {
@@ -619,4 +624,6 @@ void MockConnectionManager::SetServerNotReachable() {
     server_status_,
     server_reachable_ };
   channel_->NotifyListeners(event);
+  listeners_->Notify(&ServerConnectionEventListener::OnServerConnectionEvent,
+      ServerConnectionEvent2(server_status_, server_reachable_));
 }