NOT FOR COMMIT: Add DeviceInfo type and ChangeProcessor

sync/test/engine/test_directory_setter_upper.cc

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..c7bc180c93be563258b80688421286dee34cb706 100644
--- a/sync/test/engine/test_directory_setter_upper.cc
+++ b/sync/test/engine/test_directory_setter_upper.cc
@@ -10,19 +10,23 @@
 #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_.reset(new syncable::MockTransactionObserver());
+  WeakHandle<syncable::TransactionObserver> transaction_observer =
+      MakeWeakHandle(mock_transaction_observer_->AsWeakPtr());
+
   directory_.reset(new syncable::Directory(
       new syncable::InMemoryDirectoryBackingStore(name_),
       &handler_,
@@ -31,7 +35,7 @@ void TestDirectorySetterUpper::SetUp() {
       encryption_handler_.cryptographer()));
   ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
   ASSERT_EQ(syncable::OPENED, directory_->Open(
-          name_, &delegate_, NullTransactionObserver()));
+          name_, &delegate_, transaction_observer));
 }
 
 void TestDirectorySetterUpper::TearDown() {