gdata: Remove use of GetGDataEntryByPath() from Rename

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 1450 matching lines @@
 
   // It is a no-op if the file is renamed to the same name.
   if (file_path.BaseName().value() == new_name) {
     if (!callback.is_null()) {
       MessageLoop::current()->PostTask(
           FROM_HERE, base::Bind(callback, GDATA_FILE_OK, file_path));
     }
     return;
   }
 
-  GDataEntry* entry = GetGDataEntryByPath(file_path);
-  if (!entry) {
-    if (!callback.is_null()) {
-      MessageLoop::current()->PostTask(FROM_HERE,
-          base::Bind(callback, GDATA_FILE_ERROR_NOT_FOUND, file_path));
-    }
+  // Get the edit URL of an entry at |file_path|.
+  GetEntryInfoByPath(file_path,
+                     base::Bind(
+                         &GDataFileSystem::RenameAfterGetEntryInfo,
+                         ui_weak_ptr_,
+                         file_path,
+                         new_name,
+                         callback));
+}
+
+void GDataFileSystem::RenameAfterGetEntryInfo(
+    const FilePath& file_path,
+    const FilePath::StringType& new_name,
+    const FilePathUpdateCallback& callback,
+    GDataFileError error,
+    scoped_ptr<GDataEntryProto> entry_proto) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  if (error != GDATA_FILE_OK) {
+    if (!callback.is_null())
+      callback.Run(error, file_path);
     return;
   }
+  DCHECK(entry_proto.get());
 
   // Drop the .g<something> extension from |new_name| if the file being
   // renamed is a hosted document and |new_name| has the same .g<something>
   // extension as the file.
   FilePath::StringType file_name = new_name;
-  if (entry->AsGDataFile() && entry->AsGDataFile()->is_hosted_document()) {
+  if (entry_proto->has_file_specific_info() &&

[achuithb, 2012/07/23 22:06:00]

I know this is not part of this CL, but what happens if this is not true?
Shouldn't the callback be run with GDATA_FILE_ERROR_NOT_FOUND?

[satorux1, 2012/07/23 22:23:58]

Nothing is wrong with entry_proto->has_file_specific_info() == false, as we are
handling directories as well as files here.

+      entry_proto->file_specific_info().is_hosted_document()) {
     FilePath new_file(file_name);
-    if (new_file.Extension() == entry->AsGDataFile()->document_extension()) {
+    if (new_file.Extension() ==
+        entry_proto->file_specific_info().document_extension()) {
       file_name = new_file.RemoveExtension().value();
     }
   }
 
   documents_service_->RenameResource(
-      entry->edit_url(),
+      GURL(entry_proto->edit_url()),
       file_name,
       base::Bind(&GDataFileSystem::OnRenameResourceCompleted,
                  ui_weak_ptr_,
                  file_path,
                  file_name,
                  callback));
 }
 
 void GDataFileSystem::Move(const FilePath& src_file_path,
                            const FilePath& dest_file_path,
@@ skipping 2560 matching lines @@
   // must go through here. Removes the |file_path| from the remembered set so
   // that subsequent operations can open the file again.
   open_files_.erase(file_path);
 
   // Then invokes the user-supplied callback function.
   if (!callback.is_null())
     callback.Run(result);
 }
 
 }  // namespace gdata