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

sync/tools/sync_client.cc

Index: sync/tools/sync_client.cc
diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc
index d9fd4c5f7312be493511a7cee750aa75619bf2b6..a5ea7cc18188e385ff9d2e50f79b919e08426f50 100644
--- a/sync/tools/sync_client.cc
+++ b/sync/tools/sync_client.cc
@@ -38,6 +38,7 @@
 #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"
 
@@ -354,13 +355,14 @@ int main(int argc, char* argv[]) {
                     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,