| Index: chrome/test/sync/engine/test_directory_setter_upper.cc
|
| ===================================================================
|
| --- chrome/test/sync/engine/test_directory_setter_upper.cc (revision 51231)
|
| +++ chrome/test/sync/engine/test_directory_setter_upper.cc (working copy)
|
| @@ -25,11 +25,15 @@
|
|
|
| void TestDirectorySetterUpper::Init() {
|
| ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
|
| - manager_.reset(new DirectoryManager(temp_dir_.path()));
|
| + reset_directory_manager(new DirectoryManager(temp_dir_.path()));
|
| file_path_ = manager_->GetSyncDataDatabasePath();
|
| file_util::Delete(file_path_, false);
|
| }
|
|
|
| +void TestDirectorySetterUpper::reset_directory_manager(DirectoryManager* d) {
|
| + manager_.reset(d);
|
| +}
|
| +
|
| void TestDirectorySetterUpper::SetUp() {
|
| Init();
|
| ASSERT_TRUE(manager()->Open(name()));
|
| @@ -104,4 +108,27 @@
|
| }
|
| }
|
|
|
| +MockDirectorySetterUpper::MockDirectory::MockDirectory(
|
| + const std::string& name) {
|
| + init_kernel(name);
|
| +}
|
| +
|
| +MockDirectorySetterUpper::Manager::Manager(
|
| + const FilePath& root_path, syncable::Directory* dir) :
|
| + syncable::DirectoryManager(root_path) {
|
| + managed_directory_ = dir;
|
| +}
|
| +
|
| +MockDirectorySetterUpper::MockDirectorySetterUpper()
|
| + : directory_(new MockDirectory(name())) {
|
| +}
|
| +
|
| +void MockDirectorySetterUpper::SetUp() {
|
| + reset_directory_manager(new Manager(FilePath(), directory_.get()));
|
| +}
|
| +
|
| +void MockDirectorySetterUpper::TearDown() {
|
| + // Nothing to do here.
|
| +}
|
| +
|
| } // namespace browser_sync
|
|
|