Reverting 27117.

chrome/test/sync/engine/test_directory_setter_upper.cc

 // Copyright (c) 2009 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/test/sync/engine/test_directory_setter_upper.h"
 
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/syncable/syncable.h"
 #include "chrome/browser/sync/util/compat_file.h"
 #include "chrome/browser/sync/util/event_sys-inl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using syncable::DirectoryManager;
 using syncable::ReadTransaction;
 using syncable::ScopedDirLookup;
 
 namespace browser_sync {
 
 TestDirectorySetterUpper::TestDirectorySetterUpper() : name_(PSTR("Test")) {}
 
 TestDirectorySetterUpper::~TestDirectorySetterUpper() {}
 
-void TestDirectorySetterUpper::Init() {
+void TestDirectorySetterUpper::SetUp() {
   PathString test_data_dir_ = PSTR(".");
   manager_.reset(new DirectoryManager(test_data_dir_));
   file_path_ = manager_->GetSyncDataDatabasePath();
   PathRemove(file_path_.c_str());
-}
 
-void TestDirectorySetterUpper::SetUp() {
-  Init();
   ASSERT_TRUE(manager()->Open(name()));
 }
 
 void TestDirectorySetterUpper::TearDown() {
   if (!manager())
     return;
 
   {
     // A small scope so we don't have the dir open when we close it and reset
     // the DirectoryManager below.
@@ skipping 18 matching lines @@
     ReadTransaction trans(dir, __FILE__, __LINE__);
     dir->CheckTreeInvariants(&trans, false);
   }
   {
     // Check invariants for all items.
     ReadTransaction trans(dir, __FILE__, __LINE__);
     dir->CheckTreeInvariants(&trans, true);
   }
 }
 
-void ManuallyOpenedTestDirectorySetterUpper::SetUp() {
-  Init();
-}
-
-void ManuallyOpenedTestDirectorySetterUpper::Open() {
-  ASSERT_TRUE(manager()->Open(name()));
-  was_opened_ = true;
-}
-
-void ManuallyOpenedTestDirectorySetterUpper::TearDown() {
-  if (was_opened_) {
-    TestDirectorySetterUpper::TearDown();
-  }
-}
-
 }  // namespace browser_sync