[Sync] Refactor sync manager into interface.

sync_manager.h now defines a pure interface. The actual implementation is
in sync_manager_impl.h/cc. In order to support this, we also create a
SyncManagerFactory, which allows us to dependency inject a SyncManager
implementation into the SyncBackendHost. Follow up patches will
make use of this injection, as well as split the SyncManager tests
out of syncapi_unittest.

R=akalin@chromium.org
BUG=133061
TEST=


Review URL: https://chromiumcodereview.appspot.com/10704214

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147076 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 6 deletions

diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc
index d9fd4c5..1b9dbf8 100644
--- a/sync/tools/sync_client.cc
+++ b/sync/tools/sync_client.cc
@@ -32,12 +32,14 @@
 #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/sync_manager_factory.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"
 
@@ -326,7 +328,9 @@ int main(int argc, char* argv[]) {
   workers.push_back(passive_model_safe_worker.get());
 
   // Set up sync manager.
-  syncer::SyncManager sync_manager("sync_client manager");
+  syncer::SyncManagerFactory sync_manager_factory;
+  scoped_ptr<syncer::SyncManager> sync_manager =
+      sync_manager_factory.CreateSyncManager("sync_client manager");
   LoggingJsEventHandler js_event_handler;
   const char kSyncServerAndPath[] = "clients4.google.com/chrome-sync/dev";
   int kSyncServerPort = 443;
@@ -347,20 +351,21 @@ int main(int argc, char* argv[]) {
       syncer::SyncManager::NON_TEST;
   NullEncryptor null_encryptor;
   LoggingUnrecoverableErrorHandler unrecoverable_error_handler;
-  sync_manager.Init(database_dir.path(),
+  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,
@@ -368,8 +373,8 @@ int main(int argc, char* argv[]) {
                     &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_manager->UpdateEnabledTypes(model_types);
+  sync_manager->StartSyncingNormally(routing_info);
 
   sync_loop.Run();