Revert "Revert 142517 - [Sync] Refactor sync configuration logic."

sync/tools/sync_client.cc

 // Copyright (c) 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.
 
 #include <cstddef>
 #include <cstdio>
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/base64.h"
@@ skipping 20 matching lines @@
 #include "sync/internal_api/public/engine/passive_model_worker.h"
 #include "sync/internal_api/public/http_bridge.h"
 #include "sync/internal_api/public/read_node.h"
 #include "sync/internal_api/public/sync_manager.h"
 #include "sync/internal_api/public/util/report_unrecoverable_error_function.h"
 #include "sync/internal_api/public/util/unrecoverable_error_handler.h"
 #include "sync/internal_api/public/util/weak_handle.h"
 #include "sync/js/js_event_details.h"
 #include "sync/js/js_event_handler.h"
 #include "sync/notifier/invalidation_state_tracker.h"
+#include "sync/notifier/sync_notifier.h"
 #include "sync/notifier/sync_notifier_factory.h"
 #include "sync/test/fake_encryptor.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #endif
 
 // This is a simple utility that initializes a sync client and
 // prints out any events.
 
@@ skipping 296 matching lines @@
       syncer::SyncManager::NON_TEST;
   NullEncryptor null_encryptor;
   LoggingUnrecoverableErrorHandler unrecoverable_error_handler;
   sync_manager.Init(database_dir.path(),
                     syncer::WeakHandle<syncer::JsEventHandler>(
                         js_event_handler.AsWeakPtr()),
                     kSyncServerAndPath,
                     kSyncServerPort,
                     kUseSsl,
                     blocking_task_runner,
-                    post_factory.release(),
+                    post_factory.Pass(),
                     routing_info,
                     workers,
                     extensions_activity_monitor,
                     &change_delegate,
                     credentials,
-                    sync_notifier_factory.CreateSyncNotifier(),
+                    scoped_ptr<syncer::SyncNotifier>(
+                        sync_notifier_factory.CreateSyncNotifier()),
                     kRestoredKeyForBootstrapping,
                     kTestingMode,
                     &null_encryptor,
                     &unrecoverable_error_handler,
                     &LogUnrecoverableErrorContext);
   // TODO(akalin): We have pass in model parameters multiple times.
   // Organize handling of model types.
   sync_manager.UpdateEnabledTypes(model_types);
   sync_manager.StartSyncingNormally(routing_info);
 
   sync_loop.Run();
 
   io_thread.Stop();
   return 0;
 }