Revert 75287 - [Sync] Initial support for encrypting any datatype (no UI hook...

chrome/browser/sync/glue/session_model_associator.cc

Index: chrome/browser/sync/glue/session_model_associator.cc
===================================================================
--- chrome/browser/sync/glue/session_model_associator.cc	(revision 75295)
+++ chrome/browser/sync/glue/session_model_associator.cc	(working copy)
@@ -40,16 +40,6 @@
   DCHECK(sync_service_);
 }
 
-SessionModelAssociator::SessionModelAssociator(ProfileSyncService* sync_service,
-                                               bool setup_for_test)
-    : tab_pool_(sync_service),
-      local_session_syncid_(sync_api::kInvalidId),
-      sync_service_(sync_service),
-      setup_for_test_(setup_for_test) {
-  DCHECK(CalledOnValidThread());
-  DCHECK(sync_service_);
-}
-
 SessionModelAssociator::~SessionModelAssociator() {
   DCHECK(CalledOnValidThread());
 }
@@ -503,7 +493,8 @@
     const int64 modification_time) {
   DCHECK(CalledOnValidThread());
   std::string foreign_session_tag = specifics.session_tag();
-  DCHECK(foreign_session_tag != GetCurrentMachineTag() || setup_for_test_);
+  DCHECK(foreign_session_tag != GetCurrentMachineTag() ||
+         sync_service_->cros_user() == "test user");  // For tests.
 
   if (specifics.has_header()) {
     // Read in the header data for this foreign session.