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

chrome/test/sync/engine/mock_connection_manager.cc

 // Copyright (c) 2009 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.
 //
 // Mock ServerConnectionManager class for use in client regression tests.
 
 #include "chrome/test/sync/engine/mock_connection_manager.h"
 
 #include <map>
 
 #include "chrome/browser/sync/engine/syncer_proto_util.h"
 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"
 #include "chrome/test/sync/engine/test_id_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 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;
 using std::string;
 using sync_pb::ClientToServerMessage;
 using sync_pb::ClientToServerResponse;
 using sync_pb::CommitMessage;
 using sync_pb::CommitResponse;
 using sync_pb::CommitResponse_EntryResponse;
 using sync_pb::GetUpdatesMessage;
@@ skipping 573 matching lines @@
   return NULL;
 }
 
 void MockConnectionManager::SetServerReachable() {
   server_status_ = HttpResponse::SERVER_CONNECTION_OK;
   server_reachable_ = true;
   browser_sync::ServerConnectionEvent event = {
     browser_sync::ServerConnectionEvent::STATUS_CHANGED,
     server_status_,
     server_reachable_ };
+
   channel_->NotifyListeners(event);
+  listeners_->Notify(&ServerConnectionEventListener::OnServerConnectionEvent,
+      ServerConnectionEvent2(server_status_, server_reachable_));
 }
 
 void MockConnectionManager::SetServerNotReachable() {
   server_status_ = HttpResponse::CONNECTION_UNAVAILABLE;
   server_reachable_ = false;
   browser_sync::ServerConnectionEvent event = {
     browser_sync::ServerConnectionEvent::STATUS_CHANGED,
     server_status_,
     server_reachable_ };
   channel_->NotifyListeners(event);
+  listeners_->Notify(&ServerConnectionEventListener::OnServerConnectionEvent,
+      ServerConnectionEvent2(server_status_, server_reachable_));
 }