From e26908e679e2548b3c727692c654d02ddf95def5 Mon Sep 17 00:00:00 2001 From: "tim@chromium.org" Date: Fri, 22 Jun 2012 19:52:12 +0000 Subject: 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 --- sync/test/engine/test_directory_setter_upper.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'sync/test') 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())); } -- cgit v1.1