[Sync] Split DirectoryChangeListener for thread-safety

chrome/test/sync/engine/test_directory_setter_upper.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // A handy class that takes care of setting up and destroying a
 // syncable::Directory instance for unit tests that require one.
 //
 // The expected usage is to make this a component of your test fixture:
 //
 //   class AwesomenessTest : public testing::Test {
@@ skipping 20 matching lines @@
 #define CHROME_TEST_SYNC_ENGINE_TEST_DIRECTORY_SETTER_UPPER_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #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 {
 class DirectoryManager;
 class ScopedDirLookup;
 }  // namespace syncable
 
 namespace browser_sync {
 
 class TestDirectorySetterUpper {
@@ skipping 12 matching lines @@
 
   syncable::DirectoryManager* manager() const { return manager_.get(); }
   const std::string& name() const { return name_; }
 
  protected:
   // Subclasses may want to use a different directory name.
   explicit TestDirectorySetterUpper(const std::string& name);
   virtual void Init();
   void reset_directory_manager(syncable::DirectoryManager* d);
 
+  syncable::NullDirectoryChangeDelegate delegate_;
+
  private:
   void RunInvariantCheck(const syncable::ScopedDirLookup& dir);
 
   scoped_ptr<syncable::DirectoryManager> manager_;
   const std::string name_;
   ScopedTempDir temp_dir_;
 
   DISALLOW_COPY_AND_ASSIGN(TestDirectorySetterUpper);
 };
 
@@ skipping 30 matching lines @@
    public:
     Manager(const FilePath& root_path, syncable::Directory* dir);
     virtual ~Manager() { managed_directory_ = NULL; }
   };
 
   class MockDirectory : public syncable::Directory {
    public:
     explicit MockDirectory(const std::string& name);
     virtual ~MockDirectory();
     MOCK_METHOD1(PurgeEntriesWithTypeIn, void(const syncable::ModelTypeSet&));
+
+   private:
+    syncable::NullDirectoryChangeDelegate delegate_;
   };
 
   MockDirectorySetterUpper();
   virtual ~MockDirectorySetterUpper();
 
   virtual void SetUp();
   virtual void TearDown();
   MockDirectory* directory() { return directory_.get(); }
 
  private:
   scoped_ptr<MockDirectory> directory_;
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_TEST_SYNC_ENGINE_TEST_DIRECTORY_SETTER_UPPER_H_