[Sync] Split DirectoryChangeListener for thread-safety

chrome/test/sync/engine/test_directory_setter_upper.h

Index: chrome/test/sync/engine/test_directory_setter_upper.h
diff --git a/chrome/test/sync/engine/test_directory_setter_upper.h b/chrome/test/sync/engine/test_directory_setter_upper.h
index 2d523fa5c81114ac02e79de554a603c85dce42e6..bd81749f87c42aac8427ce81932db29e1fb6ca88 100644
--- a/chrome/test/sync/engine/test_directory_setter_upper.h
+++ b/chrome/test/sync/engine/test_directory_setter_upper.h
@@ -38,6 +38,7 @@
 #include "base/scoped_temp_dir.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/syncable/syncable.h"
+#include "chrome/test/sync/null_directory_change_delegate.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace syncable {
@@ -70,6 +71,8 @@ class TestDirectorySetterUpper {
   virtual void Init();
   void reset_directory_manager(syncable::DirectoryManager* d);
 
+  syncable::NullDirectoryChangeDelegate delegate_;
+
  private:
   void RunInvariantCheck(const syncable::ScopedDirLookup& dir);
 
@@ -120,6 +123,9 @@ class MockDirectorySetterUpper : public TestDirectorySetterUpper {
     explicit MockDirectory(const std::string& name);
     virtual ~MockDirectory();
     MOCK_METHOD1(PurgeEntriesWithTypeIn, void(const syncable::ModelTypeSet&));
+
+   private:
+    syncable::NullDirectoryChangeDelegate delegate_;
   };
 
   MockDirectorySetterUpper();