Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(262)

Unified Diff: sync/test/engine/test_directory_setter_upper.cc

Issue 10911073: NOT FOR COMMIT: Add DeviceInfo type and ChangeProcessor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Introduce SyncedDeviceTracker (the ChangeProcessor) Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sync/test/engine/test_directory_setter_upper.cc
diff --git a/sync/test/engine/test_directory_setter_upper.cc b/sync/test/engine/test_directory_setter_upper.cc
index 318900d824bb284fc9e346b9bfa0c777ae6c3adf..66bbf263c13689328af68d1cc991ea02a6ab672d 100644
--- a/sync/test/engine/test_directory_setter_upper.cc
+++ b/sync/test/engine/test_directory_setter_upper.cc
@@ -10,28 +10,31 @@
#include "base/string_util.h"
#include "sync/syncable/directory.h"
#include "sync/syncable/in_memory_directory_backing_store.h"
+#include "sync/syncable/mutable_entry.h"
#include "sync/syncable/read_transaction.h"
-#include "sync/test/null_transaction_observer.h"
+#include "sync/syncable/write_transaction.h"
+#include "sync/test/mock_transaction_observer.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace syncer {
-using syncable::NullTransactionObserver;
-
TestDirectorySetterUpper::TestDirectorySetterUpper() : name_("Test") {}
TestDirectorySetterUpper::~TestDirectorySetterUpper() {}
void TestDirectorySetterUpper::SetUp() {
+ mock_transaction_observer_ = new syncable::MockTransactionObserver();
+ WeakHandle<syncable::TransactionObserver> transaction_observer =
+ MakeWeakHandle(mock_transaction_observer_->AsWeakPtr());
+
directory_.reset(new syncable::Directory(
new syncable::InMemoryDirectoryBackingStore(name_),
&handler_,
NULL,
&encryption_handler_,
encryption_handler_.cryptographer()));
- ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
ASSERT_EQ(syncable::OPENED, directory_->Open(
- name_, &delegate_, NullTransactionObserver()));
+ name_, &delegate_, transaction_observer));
}
void TestDirectorySetterUpper::TearDown() {
@@ -44,8 +47,6 @@ void TestDirectorySetterUpper::TearDown() {
directory()->SaveChanges();
directory_.reset();
-
- ASSERT_TRUE(temp_dir_.Delete());
}
void TestDirectorySetterUpper::RunInvariantCheck() {

Powered by Google App Engine
This is Rietveld 408576698