gdata: Remove unnecessary callback function OnTransferRegularFileCompleteForCopy

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 35 matching lines @@
 
 // GData update check interval (in seconds).
 #ifndef NDEBUG
 const int kGDataUpdateCheckIntervalInSec = 5;
 #else
 const int kGDataUpdateCheckIntervalInSec = 60;
 #endif
 
 //================================ Helper functions ============================
 
-// Invoked upon completion of TransferRegularFile initiated by Copy.
-//
-// |callback| is run on the thread represented by |relay_proxy|.
-void OnTransferRegularFileCompleteForCopy(
-    const FileOperationCallback& callback,
-    scoped_refptr<base::MessageLoopProxy> relay_proxy,
-    GDataFileError error) {
-  if (!callback.is_null())
-    relay_proxy->PostTask(FROM_HERE, base::Bind(callback, error));
-}
-
 // Runs GetFileCallback with pointers dereferenced.
 // Used for PostTaskAndReply().
 void RunGetFileCallbackHelper(const GetFileCallback& callback,
                               GDataFileError* error,
                               FilePath* file_path,
                               std::string* mime_type,
                               GDataFileType* file_type) {
   DCHECK(error);
   DCHECK(file_path);
   DCHECK(mime_type);
@@ skipping 940 matching lines @@
     const std::string& unused_mime_type,
     GDataFileType file_type) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   if (error != GDATA_FILE_OK) {
     callback.Run(error);
     return;
   }
 
-  // This callback is only triggered for a regular file via Copy() and runs
-  // on the same thread as Copy (IO thread). As TransferRegularFile must run
-  // on the UI thread, we thus need to post a task to the UI thread.
-  // Also, upon the completion of TransferRegularFile, we need to run |callback|
-  // on the same thread as Copy (IO thread), and the transition from UI thread
-  // to IO thread is handled by OnTransferRegularFileCompleteForCopy.
+  // This callback is only triggered for a regular file via Copy().
   DCHECK_EQ(REGULAR_FILE, file_type);
-  BrowserThread::PostTask(
-      BrowserThread::UI,
-      FROM_HERE,
-      base::Bind(&GDataFileSystem::TransferRegularFile,
-                 ui_weak_ptr_,
-                 local_file_path, remote_dest_file_path,
-                 base::Bind(OnTransferRegularFileCompleteForCopy,
-                            callback,
-                            base::MessageLoopProxy::current())));
+  TransferRegularFile(local_file_path, remote_dest_file_path, callback);
 }
 
 void GDataFileSystem::OnGetFileCompleteForTransferFile(
     const FilePath& local_dest_file_path,
     const FileOperationCallback& callback,
     GDataFileError error,
     const FilePath& local_file_path,
     const std::string& unused_mime_type,
     GDataFileType file_type) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 2389 matching lines @@
     return;
   }
 
   PlatformFileInfoProto entry_file_info;
   GDataEntry::ConvertPlatformFileInfoToProto(*file_info, &entry_file_info);
   *entry_proto->mutable_file_info() = entry_file_info;
   callback.Run(GDATA_FILE_OK, entry_proto.Pass());
 }
 
 }  // namespace gdata