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

chrome/browser/sync/engine/syncer.cc

 // 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.
 
 #include "chrome/browser/sync/engine/syncer.h"
 
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "chrome/browser/sync/engine/apply_updates_command.h"
 #include "chrome/browser/sync/engine/build_and_process_conflict_sets_command.h"
@@ skipping 253 matching lines @@
         break;
       }
       case CLEAR_PRIVATE_DATA: {
         VLOG(1) << "Clear Private Data";
         ClearDataCommand clear_data_command;
         clear_data_command.Execute(session);
         next_step = SYNCER_END;
         break;
       }
       case SYNCER_END: {
-        VLOG(1) << "Syncer End";
-        SyncerEndCommand syncer_end_command;
-        syncer_end_command.Execute(session);
         break;
       }
       default:
         LOG(ERROR) << "Unknown command: " << current_step;
     }
     if (last_step == current_step)
       break;
     current_step = next_step;
   }
 
-  // Always send out a cycle ended notification, regardless of end-state.
-  SyncEngineEvent event(SyncEngineEvent::SYNC_CYCLE_ENDED);
-  sessions::SyncSessionSnapshot snapshot(session->TakeSnapshot());
-  event.snapshot = &snapshot;
-  session->context()->NotifyListeners(event);
+  VLOG(1) << "Syncer End";
+  SyncerEndCommand syncer_end_command;
+  syncer_end_command.Execute(session);
   return;
 }
 
 void Syncer::ProcessClientCommand(sessions::SyncSession* session) {
   const ClientToServerResponse& response =
       session->status_controller()->updates_response();
   if (!response.has_client_command())
     return;
   const ClientCommand& command = response.client_command();
 
@@ skipping 32 matching lines @@
   entry->Put(SERVER_CTIME, 0);
   entry->Put(SERVER_VERSION, 0);
   entry->Put(SERVER_IS_DIR, false);
   entry->Put(SERVER_IS_DEL, false);
   entry->Put(IS_UNAPPLIED_UPDATE, false);
   entry->Put(SERVER_SPECIFICS, sync_pb::EntitySpecifics::default_instance());
   entry->Put(SERVER_POSITION_IN_PARENT, 0);
 }
 
 }  // namespace browser_sync