diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 19:52:12 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 19:52:12 +0000 |
| commit | e26908e679e2548b3c727692c654d02ddf95def5 (patch) | |
| tree | 0b4594ceb93a6959e408237ac8281434b61a4ab7 /sync/test | |
| parent | 0c5e365378b25adf31669934edf3f00e4a5ceb37 (diff) | |
| download | chromium_src-e26908e679e2548b3c727692c654d02ddf95def5.zip chromium_src-e26908e679e2548b3c727692c654d02ddf95def5.tar.gz chromium_src-e26908e679e2548b3c727692c654d02ddf95def5.tar.bz2 | |
sync: inject DirectoryBackingStore to Directory and remove "OpenInMemoryForTest" method from production code.
This resulted in consolidated some SyncManager::TestingMode code to the Init code path from OpenDirectory.
This is a step towards removing TestingMode in favor of some SyncManager init factories. See bug 117836
BUG=117836
TEST=sync_unit_tests
Review URL: https://chromiumcodereview.appspot.com/10641025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143688 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/test')
| -rw-r--r-- | sync/test/engine/test_directory_setter_upper.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sync/test/engine/test_directory_setter_upper.cc b/sync/test/engine/test_directory_setter_upper.cc index 5cfeb2e..b73b654 100644 --- a/sync/test/engine/test_directory_setter_upper.cc +++ b/sync/test/engine/test_directory_setter_upper.cc @@ -9,6 +9,7 @@ #include "base/location.h" #include "base/string_util.h" #include "sync/syncable/directory.h" +#include "sync/syncable/in_memory_directory_backing_store.h" #include "sync/syncable/read_transaction.h" #include "sync/test/null_transaction_observer.h" #include "testing/gtest/include/gtest/gtest.h" @@ -23,9 +24,10 @@ TestDirectorySetterUpper::TestDirectorySetterUpper() : name_("Test") {} TestDirectorySetterUpper::~TestDirectorySetterUpper() {} void TestDirectorySetterUpper::SetUp() { - directory_.reset(new syncable::Directory(&encryptor_, &handler_, NULL)); + directory_.reset(new syncable::Directory(&encryptor_, &handler_, NULL, + new syncable::InMemoryDirectoryBackingStore(name_))); ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); - ASSERT_EQ(syncable::OPENED, directory_->OpenInMemoryForTest( + ASSERT_EQ(syncable::OPENED, directory_->Open( name_, &delegate_, NullTransactionObserver())); } |