NOT FOR COMMIT: Add DeviceInfo type and ChangeProcessor

sync/test/engine/test_directory_setter_upper.h

Index: sync/test/engine/test_directory_setter_upper.h
diff --git a/sync/test/engine/test_directory_setter_upper.h b/sync/test/engine/test_directory_setter_upper.h
index 5dbce2d6cc5397d660f0622376da5cf81da9adf4..4150dc9cc8806619d7beda80440e3a6c463a8328 100644
--- a/sync/test/engine/test_directory_setter_upper.h
+++ b/sync/test/engine/test_directory_setter_upper.h
@@ -34,18 +34,18 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/scoped_temp_dir.h"
 #include "sync/test/fake_sync_encryption_handler.h"
 #include "sync/test/null_directory_change_delegate.h"
 #include "sync/util/test_unrecoverable_error_handler.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
+namespace syncer {
+
 namespace syncable {
   class Directory;
+  class MockTransactionObserver;
 }
 
-namespace syncer {
-
 class TestDirectorySetterUpper {
  public:
   TestDirectorySetterUpper();
@@ -63,13 +63,17 @@ class TestDirectorySetterUpper {
 
   SyncEncryptionHandler* encryption_handler() { return &encryption_handler_; }
 
+  syncable::MockTransactionObserver* transaction_observer() {
+    return mock_transaction_observer_;
+  }
+
  private:
   syncable::NullDirectoryChangeDelegate delegate_;
+  syncable::MockTransactionObserver* mock_transaction_observer_;

[Nicolas Zea, 2012/09/13 00:45:55]

scoped_ptr? Or if you pass ownership, comment here who you pass it to.

[rlarocque, 2012/09/14 01:03:07]

Done.

   TestUnrecoverableErrorHandler handler_;
 
   void RunInvariantCheck();
 
-  ScopedTempDir temp_dir_;
   FakeSyncEncryptionHandler encryption_handler_;
   scoped_ptr<syncable::Directory> directory_;
   std::string name_;