sync: take two for: "Added classes to enable session sync...

chrome/browser/sync/profile_sync_factory_impl.cc

Index: chrome/browser/sync/profile_sync_factory_impl.cc
diff --git a/chrome/browser/sync/profile_sync_factory_impl.cc b/chrome/browser/sync/profile_sync_factory_impl.cc
index eb3cca821731dd70b6f37988ff04e418f318ccf2..7ba2c52abc803d5590897c6ddf59453c0e8c3562 100644
--- a/chrome/browser/sync/profile_sync_factory_impl.cc
+++ b/chrome/browser/sync/profile_sync_factory_impl.cc
@@ -24,6 +24,9 @@
 #include "chrome/browser/sync/glue/preference_change_processor.h"
 #include "chrome/browser/sync/glue/preference_data_type_controller.h"
 #include "chrome/browser/sync/glue/preference_model_associator.h"
+#include "chrome/browser/sync/glue/session_change_processor.h"
+#include "chrome/browser/sync/glue/session_data_type_controller.h"
+#include "chrome/browser/sync/glue/session_model_associator.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
 #include "chrome/browser/sync/glue/theme_change_processor.h"
 #include "chrome/browser/sync/glue/theme_data_type_controller.h"
@@ -55,6 +58,9 @@ using browser_sync::PasswordModelAssociator;
 using browser_sync::PreferenceChangeProcessor;
 using browser_sync::PreferenceDataTypeController;
 using browser_sync::PreferenceModelAssociator;
+using browser_sync::SessionChangeProcessor;
+using browser_sync::SessionDataTypeController;
+using browser_sync::SessionModelAssociator;
 using browser_sync::SyncBackendHost;
 using browser_sync::ThemeChangeProcessor;
 using browser_sync::ThemeDataTypeController;
@@ -129,6 +135,12 @@ ProfileSyncService* ProfileSyncFactoryImpl::CreateProfileSyncService() {
         new TypedUrlDataTypeController(this, profile_, pss));
   }
 
+  // Session sync is enabled by default.  Register unless explicitly
+  // disabled.
+  if (!command_line_->HasSwitch(switches::kDisableSyncSessions)) {
+    pss->RegisterDataTypeController(
+        new SessionDataTypeController(this, pss));
+  }
   return pss;
 }
 
@@ -249,3 +261,15 @@ ProfileSyncFactoryImpl::CreateTypedUrlSyncComponents(
                                   error_handler);
   return SyncComponents(model_associator, change_processor);
 }
+
+ProfileSyncFactory::SyncComponents
+ProfileSyncFactoryImpl::CreateSessionSyncComponents(
+    ProfileSyncService* profile_sync_service,
+    UnrecoverableErrorHandler* error_handler) {
+  SessionModelAssociator* model_associator =
+      new SessionModelAssociator(profile_sync_service);
+  SessionChangeProcessor* change_processor =
+      new SessionChangeProcessor(error_handler, model_associator);
+  return SyncComponents(model_associator, change_processor);
+}
+