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

chrome/browser/sync/profile_sync_service.h

Index: chrome/browser/sync/profile_sync_service.h
diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
index 19795ce591e5b0688aebfd4db3d72ac0fb075cce..31762815fe552d27100c3c7af24a6e7b86bf4631 100644
--- a/chrome/browser/sync/profile_sync_service.h
+++ b/chrome/browser/sync/profile_sync_service.h
@@ -35,6 +35,7 @@
 #include "googleurl/src/gurl.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/engine/model_safe_worker.h"
+#include "sync/internal_api/public/sync_manager_factory.h"
 #include "sync/internal_api/public/util/experiments.h"
 #include "sync/internal_api/public/util/unrecoverable_error_handler.h"
 #include "sync/js/sync_js_controller.h"
@@ -50,6 +51,8 @@ class ChangeProcessor;
 class DataTypeManager;
 class JsController;
 class SessionModelAssociator;
+class SyncManagerFactory;
+
 namespace sessions { class SyncSessionSnapshot; }
 }
 
@@ -793,6 +796,9 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
   // The set of currently enabled sync experiments.
   syncer::Experiments current_experiments;
 
+  // Factory the backend will use to build the sync manager.
+  syncer::SyncManagerFactory sync_manager_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
 };