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

chrome/browser/sync/profile_sync_service_session_unittest.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 <map>
 #include <string>
 
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 38 matching lines @@
 
 namespace browser_sync {
 
 class ProfileSyncServiceSessionTest
     : public BrowserWithTestWindowTest,
       public NotificationObserver {
  public:
   ProfileSyncServiceSessionTest()
       : window_bounds_(0, 1, 2, 3),
         notified_of_update_(false) {}
+
   ProfileSyncService* sync_service() { return sync_service_.get(); }
 
   TestIdFactory* ids() { return sync_service_->id_factory(); }
 
  protected:
   SessionService* service() { return helper_.service(); }
 
   virtual void SetUp() {
-    // BrowserWithTestWindowTest implementation.
     BrowserWithTestWindowTest::SetUp();
-
     profile()->set_has_history_service(true);
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     SessionService* session_service = new SessionService(temp_dir_.path());
     helper_.set_service(session_service);
     service()->SetWindowType(window_id_, Browser::TYPE_NORMAL);
     service()->SetWindowBounds(window_id_, window_bounds_, false);
     registrar_.Add(this, NotificationType::FOREIGN_SESSION_UPDATED,
         NotificationService::AllSources());
   }
 
@@ skipping 12 matching lines @@
 
   virtual void TearDown() {
     helper_.set_service(NULL);
     profile()->set_session_service(NULL);
     sync_service_.reset();
   }
 
   bool StartSyncService(Task* task, bool will_fail_association) {
     if (sync_service_.get())
       return false;
+
     sync_service_.reset(new TestProfileSyncService(
         &factory_, profile(), "test user", false, task));
     profile()->set_session_service(helper_.service());
 
     // Register the session data type.
     model_associator_ =
-        new SessionModelAssociator(sync_service_.get(),
-                                   true /* setup_for_test */);
+        new SessionModelAssociator(sync_service_.get());
     change_processor_ = new SessionChangeProcessor(
-        sync_service_.get(), model_associator_,
-        true /* setup_for_test */);
+        sync_service_.get(), model_associator_);
     EXPECT_CALL(factory_, CreateSessionSyncComponents(_, _)).
         WillOnce(Return(ProfileSyncFactory::SyncComponents(
             model_associator_, change_processor_)));
     EXPECT_CALL(factory_, CreateDataTypeManager(_, _)).
         WillOnce(ReturnNewDataTypeManager());
     sync_service_->set_num_expected_resumes(will_fail_association ? 0 : 1);
     sync_service_->RegisterDataTypeController(
         new SessionDataTypeController(&factory_, sync_service_.get()));
     profile()->GetTokenService()->IssueAuthTokenForTest(
         GaiaConstants::kSyncService, "token");
@@ skipping 294 matching lines @@
   ASSERT_FALSE(model_associator_->tab_pool_.full());
   for (size_t i = 0; i < num_ids; ++i) {
     model_associator_->tab_pool_.FreeTabNode(node_ids[i]);
   }
   ASSERT_EQ(num_ids, model_associator_->tab_pool_.capacity());
   ASSERT_FALSE(model_associator_->tab_pool_.empty());
   ASSERT_TRUE(model_associator_->tab_pool_.full());
 }
 
 }  // namespace browser_sync