Replace GDataDirectory::TakeEntry with GDataDirectoryService::AddEntryToDirectory.

chrome/browser/chromeos/gdata/gdata_files.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_files.h"
 
 #include <leveldb/db.h>
 #include <vector>
 
 #include "base/message_loop_proxy.h"
@@ skipping 306 matching lines @@
 
   // Add entry to resource map.
   if (directory_service_)
     directory_service_->AddEntryToResourceMap(entry);
 
   // Setup child and parent links.
   AddChild(entry);
   entry->SetParent(this);
 }
 
-bool GDataDirectory::TakeEntry(GDataEntry* entry) {
-  DCHECK(entry);
-  DCHECK(entry->parent());
-
-  entry->parent()->RemoveChild(entry);
-  AddEntry(entry);
-
-  return true;
-}
-
 bool GDataDirectory::TakeOverEntries(GDataDirectory* dir) {
   for (GDataFileCollection::iterator iter = dir->child_files_.begin();
        iter != dir->child_files_.end(); ++iter) {
     AddEntry(iter->second);
   }
   dir->child_files_.clear();
 
   for (GDataDirectoryCollection::iterator iter =
       dir->child_directories_.begin();
        iter != dir->child_directories_.end(); ++iter) {
@@ skipping 226 matching lines @@
   root_->RemoveChildren();
   RemoveEntryFromResourceMap(root_.get());
   DCHECK(resource_map_.empty());
   resource_map_.clear();
   root_.reset();
 }
 
 void GDataDirectoryService::AddEntryToDirectory(
     const FilePath& directory_path,
     GDataEntry* entry,
-    const FileOperationCallback& callback) {
+    const FilePathUpdateCallback& callback) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(entry);
+
+  if (entry->parent())
+    entry->parent()->RemoveChild(entry);
+
   GDataEntry* destination = FindEntryByPathSync(directory_path);
+  FilePath updated_file_path;
   GDataFileError error = GDATA_FILE_ERROR_FAILED;
   if (!destination) {
     error = GDATA_FILE_ERROR_NOT_FOUND;
   } else if (!destination->AsGDataDirectory()) {
     error = GDATA_FILE_ERROR_NOT_A_DIRECTORY;
   } else {
     destination->AsGDataDirectory()->AddEntry(entry);
+    updated_file_path = entry->GetFilePath();
     error = GDATA_FILE_OK;
   }
   if (!callback.is_null()) {
     base::MessageLoopProxy::current()->PostTask(
-        FROM_HERE, base::Bind(callback, error));
+        FROM_HERE, base::Bind(callback, error, updated_file_path));
   }
 }
 
 void GDataDirectoryService::AddEntryToResourceMap(GDataEntry* entry) {
   // GDataFileSystem has already locked.
   DVLOG(1) << "AddEntryToResourceMap " << entry->resource_id();
   resource_map_.insert(std::make_pair(entry->resource_id(), entry));
 }
 
 void GDataDirectoryService::RemoveEntryFromResourceMap(GDataEntry* entry) {
@@ skipping 342 matching lines @@
   file_specific_info->set_file_md5(file_md5_);
   file_specific_info->set_document_extension(document_extension_);
   file_specific_info->set_is_hosted_document(is_hosted_document_);
 }
 
 bool GDataDirectory::FromProto(const GDataDirectoryProto& proto) {
   DCHECK(proto.gdata_entry().file_info().is_directory());
   DCHECK(!proto.gdata_entry().has_file_specific_info());
 
   for (int i = 0; i < proto.child_files_size(); ++i) {
-    scoped_ptr<GDataFile> file(new GDataFile(this, directory_service_));
+    scoped_ptr<GDataFile> file(new GDataFile(NULL, directory_service_));

[satorux1, 2012/08/08 14:09:06]

so the parent parameter was unnecessary, because AddEntry() sets the parent. If
so, could you remove the first parameter?

[achuithb, 2012/08/08 22:08:41]

I intend to, and it will be a fun patch, but I don't want to clutter this CL
with all those changes. Is the next one ok? I can add a TODO.

     if (!file->FromProto(proto.child_files(i))) {
       RemoveChildren();
       return false;
     }
     AddEntry(file.release());
   }
   for (int i = 0; i < proto.child_directories_size(); ++i) {
-    scoped_ptr<GDataDirectory> dir(new GDataDirectory(this,
+    scoped_ptr<GDataDirectory> dir(new GDataDirectory(NULL,
                                                       directory_service_));
     if (!dir->FromProto(proto.child_directories(i))) {
       RemoveChildren();
       return false;
     }
     AddEntry(dir.release());
   }
 
   // The states of the directory should be updated after children are
   // handled successfully, so that incomplete states are not left.
@@ skipping 93 matching lines @@
     if (file->FromProto(entry_proto)) {
       entry.reset(file.release());
     } else {
       NOTREACHED() << "FromProto (file) failed";
     }
   }
   return entry.Pass();
 }
 
 }  // namespace gdata