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

chrome/browser/sync/glue/session_model_associator.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/glue/session_model_associator.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 22 matching lines @@
 }  // namespace
 
 SessionModelAssociator::SessionModelAssociator(ProfileSyncService* sync_service)
     : tab_pool_(sync_service),
       local_session_syncid_(sync_api::kInvalidId),
       sync_service_(sync_service) {
   DCHECK(CalledOnValidThread());
   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());
 }
 
 bool SessionModelAssociator::InitSyncNodeFromChromeId(
     const std::string& id,
     sync_api::BaseNode* sync_node) {
   NOTREACHED();
   return false;
 }
@@ skipping 433 matching lines @@
   DCHECK(tab_pool_.full());
 
   return true;
 }
 
 bool SessionModelAssociator::AssociateForeignSpecifics(
     const sync_pb::SessionSpecifics& specifics,
     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.
     // Header data contains window information and ordered tab id's for each
     // window.
 
     // Load (or create) the ForeignSession object for this client.
     ForeignSession* foreign_session =
         foreign_session_tracker_.GetForeignSession(foreign_session_tag);
 
@@ skipping 459 matching lines @@
   for (std::vector<TabNavigation>::const_iterator i =
       tab.navigations.begin(); i != tab.navigations.end(); ++i) {
     const TabNavigation navigation = *i;
     sync_pb::TabNavigation* tab_navigation =
         session_tab->add_navigation();
     PopulateSessionSpecificsNavigation(&navigation, tab_navigation);
   }
 }
 
 }  // namespace browser_sync