[Sync] Split DirectoryChangeListener for thread-safety

chrome/browser/sync/syncable/directory_manager.cc

Index: chrome/browser/sync/syncable/directory_manager.cc
diff --git a/chrome/browser/sync/syncable/directory_manager.cc b/chrome/browser/sync/syncable/directory_manager.cc
index 73d9f8a6009a7b62e548e3d9da9d053ef1f12fd5..7f91d5acefa2bce4692a8ca6f86075d0698a0e1a 100644
--- a/chrome/browser/sync/syncable/directory_manager.cc
+++ b/chrome/browser/sync/syncable/directory_manager.cc
@@ -51,16 +51,18 @@ DirectoryManager::~DirectoryManager() {
   delete channel_;
 }
 
-bool DirectoryManager::Open(const std::string& name) {
+bool DirectoryManager::Open(const std::string& name,
+                            DirectoryChangeDelegate* delegate) {
   bool was_open = false;
-  const DirOpenResult result = OpenImpl(name,
-      GetSyncDataDatabasePath(), &was_open);
+  const DirOpenResult result =
+      OpenImpl(name, GetSyncDataDatabasePath(), delegate, &was_open);
   return syncable::OPENED == result;
 }
 
 // Opens a directory.  Returns false on error.
 DirOpenResult DirectoryManager::OpenImpl(const std::string& name,
                                          const FilePath& path,
+                                         DirectoryChangeDelegate* delegate,
                                          bool* was_open) {
   bool opened = false;
   {
@@ -79,7 +81,7 @@ DirOpenResult DirectoryManager::OpenImpl(const std::string& name,
   // Otherwise, open it.
 
   scoped_ptr<Directory> dir(new Directory);
-  const DirOpenResult result = dir->Open(path, name);
+  const DirOpenResult result = dir->Open(path, name, delegate);
   if (syncable::OPENED == result) {
     base::AutoLock lock(lock_);
     managed_directory_ = dir.release();