gdata: Remove use of GetGDataEntryByPath() from StartFileUploadOnUIThread

chrome/browser/chromeos/gdata/gdata_file_system.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILE_SYSTEM_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILE_SYSTEM_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 154 matching lines @@
       FilePathUpdateCallback;
 
   // Callback run as a response to LoadFeedFromServer.
   typedef base::Callback<void(GetDocumentsParams* params,
                               GDataFileError error)>
       LoadDocumentFeedCallback;
 
   // Struct used to record UMA stats with FeedToFileResourceMap().
   struct FeedToFileResourceMapUmaStats;
 
+  // Struct used for StartFileUploadOnUIThread().
+  struct StartFileUploadParams;

[achuithb, 2012/07/23 22:01:45]

So the reason for these params is the Bind arg size limit?

[satorux1, 2012/07/23 22:02:49]

yes.

+
   // Finds entry object by |file_path| and returns the entry object.
   // Returns NULL if it does not find the entry.
   GDataEntry* GetGDataEntryByPath(const FilePath& file_path);
 
   // Callback passed to |LoadFeedFromServer| from |Search| method.
   // |callback| is that should be run with data received from
   // |LoadFeedFromServer|.
   // |params| params used for getting document feed for content search.
   // |error| error code returned by |LoadFeedFromServer|.
   void OnSearch(const SearchCallback& callback,
@@ skipping 456 matching lines @@
 
   // Helper function that completes bookkeeping tasks related to
   // completed file transfer.
   void OnTransferCompleted(
       const FileOperationCallback& callback,
       GDataFileError error,
       scoped_ptr<UploadFileInfo> upload_file_info);
 
   // Kicks off file upload once it receives |file_size| and |content_type|.
   void StartFileUploadOnUIThread(
-      const FilePath& local_file,
-      const FilePath& remote_dest_file,
-      const FileOperationCallback& callback,
+      const StartFileUploadParams& params,
       GDataFileError* error,
       int64* file_size,
       std::string* content_type);
 
+  // Part of StartFileUploadOnUIThread(). Called after GetEntryInfoByPath()
+  // is complete.
+  void StartFileUploadOnUIThreadAfterGetEntryInfo(
+      const StartFileUploadParams& params,
+      int64 file_size,
+      std::string content_type,
+      GDataFileError error,
+      scoped_ptr<GDataEntryProto> entry_proto);
+
   // Cache intermediate callbacks, that run on calling thread, for above cache
   // tasks that were run on blocking pool.
 
   // Helper function for internally handling responses from
   // GetFileFromCacheByResourceIdAndMd5() calls during processing of
   // GetFileByPath() request.
   void OnGetFileFromCache(const GetFileFromCacheParams& params,
                           GDataFileError error,
                           const std::string& resource_id,
                           const std::string& md5,
@@ skipping 196 matching lines @@
   base::WeakPtr<GDataFileSystem> ui_weak_ptr_;
 
   ObserverList<Observer> observers_;
 
   scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILE_SYSTEM_H_