GDataFileSystem is no longer a friend of GDataDirectory.

chrome/browser/chromeos/gdata/gdata_file_system.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/chromeos/gdata/gdata_file_system.h"
 
 #include <set>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 372 matching lines @@
 // create GetEntryInfoCallback.
 void RunGetEntryInfoWithFilePathCallback(
     const GetEntryInfoWithFilePathCallback& callback,
     const FilePath& path,
     GDataFileError error,
     scoped_ptr<GDataEntryProto> entry_proto) {
   if (!callback.is_null())
     callback.Run(error, path, entry_proto.Pass());
 }
 
+// Callback for AddEntryToDirectoryFilePathCallbackRunner.
+typedef base::Callback<void(const FilePath&)>
+    AddEntryToDirectoryCallback;

[satorux1, 2012/08/10 16:14:44]

nit: add a blank line here.

[achuithb, 2012/08/11 00:37:45]

This is gone.

+// This callback for GDataDirectoryService::AddEntryToDirectory passes
+// the entry's file path to its callback.
+void AddEntryToDirectoryFilePathCallbackRunner(GDataEntry* entry,
+    const AddEntryToDirectoryCallback& callback) {
+  DCHECK(!callback.is_null());
+  callback.Run(entry->GetFilePath());
+}
+
 }  // namespace
 
 // GDataFileSystem::CreateDirectoryParams struct implementation.
 struct GDataFileSystem::CreateDirectoryParams {
   CreateDirectoryParams(const FilePath& created_directory_path,
                         const FilePath& target_directory_path,
                         bool is_exclusive,
                         bool is_recursive,
                         const FileOperationCallback& callback);
   ~CreateDirectoryParams();
@@ skipping 1577 matching lines @@
       *params->feed_list,
       &file_map,
       &unused_delta_feed_changestamp,
       &unused_uma_stats);
   if (error != GDATA_FILE_OK) {
     LOG(ERROR) << "Failed to convert feed: " << directory_path.value()
                << ": " << error;
     return;
   }
 
-  directory_service_->GetEntryByResourceIdAsync(params->directory_resource_id,
-      base::Bind(&GDataFileSystem::RequestDirectoryRefreshByEntry,
+  directory_service_->RefreshDirectory(
+      params->directory_resource_id,
+      file_map,
+      base::Bind(&GDataFileSystem::OnDirectoryChanged,
                  ui_weak_ptr_,
-                 directory_path,
-                 params->directory_resource_id,
-                 file_map));
-}
-
-void GDataFileSystem::RequestDirectoryRefreshByEntry(
-    const FilePath& directory_path,
-    const std::string& directory_resource_id,
-    const FileResourceIdMap& file_map,
-    GDataEntry* directory_entry) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  if (!directory_entry || !directory_entry->AsGDataDirectory()) {
-    LOG(ERROR) << "Directory entry is gone: " << directory_path.value()
-               << ": " << directory_resource_id;
-    return;
-  }
-  GDataDirectory* directory = directory_entry->AsGDataDirectory();
-
-  // Remove the existing files.
-  directory->RemoveChildFiles();
-  // Go through all entries generated by the feed and add files.
-  for (FileResourceIdMap::const_iterator it = file_map.begin();
-       it != file_map.end(); ++it) {
-    scoped_ptr<GDataEntry> entry(it->second);
-    // Skip if it's not a file (i.e. directory).
-    if (!entry->AsGDataFile())
-      continue;
-    directory->AddEntry(entry.release());
-  }
-
-  // Note that there may be no change in the directory, but it's expensive to
-  // check if the new metadata matches the existing one, so we just always
-  // notify that the directory is changed.
-  OnDirectoryChanged(directory_path);
-  DVLOG(1) << "Directory refreshed: " << directory_path.value();
+                 directory_path));
 }
 
 void GDataFileSystem::UpdateFileByResourceId(
     const std::string& resource_id,
     const FileOperationCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
          BrowserThread::CurrentlyOn(BrowserThread::IO));
   RunTaskOnUIThread(
       base::Bind(&GDataFileSystem::UpdateFileByResourceIdOnUIThread,
                  ui_weak_ptr_,
@@ skipping 431 matching lines @@
     callback.Run(error);
     return;
   }
 
   scoped_ptr<DocumentEntry> doc_entry(DocumentEntry::ExtractAndParse(*data));
   if (!doc_entry.get()) {
     callback.Run(GDATA_FILE_ERROR_FAILED);
     return;
   }
 
   GDataEntry* entry = directory_service_->FromDocumentEntry(doc_entry.get());

[satorux1, 2012/08/10 23:05:55]

we might want to create a proto instead. See my next comment.

GDataEntryProto* entry_proto =
directory_service_->FromDocumentEntry(doc_entry.get());

[achuithb, 2012/08/11 00:37:45]

Let's do this in a separate patch.

   if (!entry) {
     callback.Run(GDATA_FILE_ERROR_FAILED);
     return;
   }
 
   // |entry| was added in the root directory on the server, so we should
   // first add it to |root_| to mirror the state and then move it to the
   // destination directory by MoveEntryFromRootDirectory().
-  directory_service_->root()->AddEntry(entry);
-  MoveEntryFromRootDirectory(dir_path,
-                             callback,
-                             GDATA_FILE_OK,
-                             entry->GetFilePath());
+  directory_service_->AddEntryToDirectory(
+      directory_service_->root(),
+      entry,

[satorux1, 2012/08/10 23:05:55]

would it be possible for this function to take GDataEntryProto instead?

I think GDataDirectoryService:: should take proto rater than GDataEntry family.

If it's too much work to do in this patch, you can do it in a separate patch. In
this case, please file a bug.

FWIW, GDataDirectory::AddEntry() is also used in AddNewDirectory() and I want to
get rid of FindEntryByPathSync() there, but I need to be able to add a new entry
to the GDataDirectoryService, as proto, rather than GDataEntry*.

[satorux1, 2012/08/11 00:12:21]

Filed a bug crbug.com/142048

[achuithb, 2012/08/11 00:37:45]

I'll file a bug and add a TODO.

+      base::Bind(&AddEntryToDirectoryFilePathCallbackRunner,
+          entry,
+          base::Bind(&GDataFileSystem::MoveEntryFromRootDirectory,
+                     ui_weak_ptr_,
+                     dir_path,
+                     callback,
+                     GDATA_FILE_OK)));
 }
 
 void GDataFileSystem::OnMoveEntryFromRootDirectoryCompleted(
     const FileOperationCallback& callback,
     const FilePath& file_path,
     const FilePath& dir_path,
     GDataErrorCode status,
     const GURL& document_url) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
@@ skipping 241 matching lines @@
   if (error != GDATA_FILE_OK)
     return error;
 
   // If resource_id is not empty, remove its corresponding file from cache.
   if (!resource_id.empty())
     cache_->RemoveOnUIThread(resource_id, CacheOperationCallback());
 
   return GDATA_FILE_OK;
 }
 
-// static
 void GDataFileSystem::RemoveStaleEntryOnUpload(const std::string& resource_id,
                                                GDataDirectory* parent_dir,
                                                GDataEntry* existing_entry) {
   if (existing_entry &&
       // This should always match, but just in case.
       existing_entry->parent() == parent_dir) {
-    parent_dir->RemoveEntry(existing_entry);
+    directory_service_->RemoveEntryFromParent(existing_entry, base::Closure());
   } else {
     LOG(ERROR) << "Entry for the existing file not found: " << resource_id;
   }
 }
 
 void GDataFileSystem::NotifyFileSystemMounted() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   DVLOG(1) << "File System is mounted";
   // Notify the observers that the file system is mounted.
@@ skipping 48 matching lines @@
   // file with the exact same name.
   GDataDirectory* parent_dir = entry->AsGDataDirectory();
   if (!parent_dir)
     return GDATA_FILE_ERROR_FAILED;
 
   GDataEntry* new_entry =
       directory_service_->FromDocumentEntry(doc_entry.get());
   if (!new_entry)
     return GDATA_FILE_ERROR_FAILED;
 
-  parent_dir->AddEntry(new_entry);
-
-  OnDirectoryChanged(directory_path);
+  directory_service_->AddEntryToDirectory(
+      parent_dir,
+      new_entry,
+      base::Bind(&GDataFileSystem::OnDirectoryChanged,
+                 ui_weak_ptr_,
+                 directory_path));
   return GDATA_FILE_OK;
 }
 
 GDataFileSystem::FindMissingDirectoryResult
 GDataFileSystem::FindFirstMissingParentDirectory(
     const FilePath& directory_path,
     GURL* last_dir_content_url,
     FilePath* first_missing_parent_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ skipping 38 matching lines @@
   // You can't remove root element.
   if (!entry->parent())
     return GDATA_FILE_ERROR_ACCESS_DENIED;
 
   // If it's a file (only files have resource id), get its resource id so that
   // we can remove it after releasing the auto lock.
   if (entry->AsGDataFile())
     *resource_id = entry->AsGDataFile()->resource_id();
 
   GDataDirectory* parent_dir = entry->parent();
-  parent_dir->RemoveEntry(entry);
-
-  OnDirectoryChanged(parent_dir->GetFilePath());
+  directory_service_->RemoveEntryFromParent(
+      entry,
+      base::Bind(&GDataFileSystem::OnDirectoryChanged,
+                 ui_weak_ptr_,
+                 parent_dir->GetFilePath()));
   return GDATA_FILE_OK;
 }
 
 void GDataFileSystem::AddUploadedFile(
     UploadMode upload_mode,
     const FilePath& virtual_dir_path,
     scoped_ptr<DocumentEntry> entry,
     const FilePath& file_content_path,
     GDataCache::FileOperationType cache_operation,
     const base::Closure& callback) {
@@ skipping 41 matching lines @@
     return;
 
   scoped_ptr<GDataEntry> new_entry(
       directory_service_->FromDocumentEntry(entry.get()));
   if (!new_entry.get())
     return;
 
   if (upload_mode == UPLOAD_EXISTING_FILE) {
     // Remove an existing entry, which should be present.
     const std::string& resource_id = new_entry->resource_id();
-    directory_service_->GetEntryByResourceIdAsync(resource_id,
-        base::Bind(&RemoveStaleEntryOnUpload, resource_id, parent_dir));
+    directory_service_->GetEntryByResourceIdAsync(
+        resource_id,
+        base::Bind(&GDataFileSystem::RemoveStaleEntryOnUpload,
+                   ui_weak_ptr_,
+                   resource_id,
+                   parent_dir));
   }
 
   GDataFile* file = new_entry->AsGDataFile();
   DCHECK(file);
   const std::string& resource_id = file->resource_id();
   const std::string& md5 = file->file_md5();
-  parent_dir->AddEntry(new_entry.release());
-
-  OnDirectoryChanged(virtual_dir_path);
+  directory_service_->AddEntryToDirectory(
+      parent_dir,
+      new_entry.release(),
+      base::Bind(&GDataFileSystem::OnDirectoryChanged,
+                 ui_weak_ptr_,
+                 virtual_dir_path));
 
   if (upload_mode == UPLOAD_NEW_FILE) {
     // Add the file to the cache if we have uploaded a new file.
     cache_->StoreOnUIThread(resource_id,
                             md5,
                             file_content_path,
                             cache_operation,
                             base::Bind(&OnCacheUpdatedForAddUploadedFile,
                                        callback_runner.Release()));
   } else if (upload_mode == UPLOAD_EXISTING_FILE) {
@@ skipping 467 matching lines @@
   }
 
   PlatformFileInfoProto entry_file_info;
   GDataEntry::ConvertPlatformFileInfoToProto(*file_info, &entry_file_info);
   *entry_proto->mutable_file_info() = entry_file_info;
   if (!callback.is_null())
     callback.Run(GDATA_FILE_OK, entry_proto.Pass());
 }
 
 }  // namespace gdata