Use chrome/base synchronization primitives and threads instead of...

chrome/test/sync/engine/test_directory_setter_upper.cc

Index: chrome/test/sync/engine/test_directory_setter_upper.cc
===================================================================
--- chrome/test/sync/engine/test_directory_setter_upper.cc	(revision 27087)
+++ chrome/test/sync/engine/test_directory_setter_upper.cc	(working copy)
@@ -20,12 +20,15 @@
 
 TestDirectorySetterUpper::~TestDirectorySetterUpper() {}
 
-void TestDirectorySetterUpper::SetUp() {
+void TestDirectorySetterUpper::Init() {
   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()));
 }
 
@@ -64,4 +67,19 @@
   }
 }
 
+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