gdata: Make GDataFileSystem::ReadDirectoryByPath() much more efficient

chrome/browser/chromeos/gdata/gdata_download_observer.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_DOWNLOAD_OBSERVER_H__
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_DOWNLOAD_OBSERVER_H__
 
 #include <map>
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "base/platform_file.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "chrome/browser/chromeos/gdata/gdata_errorcode.h"
 
 class Profile;
 
 namespace gdata {
 
 class DocumentEntry;
-class GDataDirectoryProto;
+class GDataEntryProto;
 class GDataFileSystemInterface;
 class GDataUploader;
 struct UploadFileInfo;
 
 // Observes downloads to temporary local gdata folder. Schedules these
 // downloads for upload to gdata service.
 class GDataDownloadObserver : public content::DownloadManager::Observer,
                               public content::DownloadItem::Observer {
  public:
   GDataDownloadObserver(GDataUploader* uploader,
@@ skipping 73 matching lines @@
 
   // Updates metadata of ongoing upload if it exists.
   void UpdateUpload(content::DownloadItem* download);
 
   // Checks if this DownloadItem should be uploaded.
   bool ShouldUpload(content::DownloadItem* download);
 
   // Creates UploadFileInfo and initializes it using DownloadItem*.
   void CreateUploadFileInfo(content::DownloadItem* download);
 
-  // Callback for handling results of GDataFileSystem::ReadDirectoryByPath()
+  // Callback for handling results of GDataFileSystem::GetEntryInfoByPath()
   // initiated by CreateUploadFileInfo(). This callback reads the directory
   // entry to determine the upload path, then calls StartUpload() to actually
   // start the upload.
-  void OnReadDirectoryByPath(
+  void OnGetEntryInfoByPath(
       int32 download_id,
       scoped_ptr<UploadFileInfo> upload_file_info,
       GDataFileError error,
-      bool /* hide_hosted_documents */,
-      scoped_ptr<GDataDirectoryProto> dir_proto);
+      scoped_ptr<GDataEntryProto> entry_proto);
 
   // Starts the upload.
   void StartUpload(int32 download_id,
                    scoped_ptr<UploadFileInfo> upload_file_info);
 
   // Callback invoked by GDataUploader when the upload associated with
   // |download_id| has completed. |error| indicated whether the
   // call was successful. This function takes ownership of DocumentEntry from
   // |upload_file_info| for use by MoveFileToGDataCache(). It also invokes the
   // MaybeCompleteDownload() method on the DownloadItem to allow it to complete.
@@ skipping 21 matching lines @@
   DownloadMap pending_downloads_;
 
   base::WeakPtrFactory<GDataDownloadObserver> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GDataDownloadObserver);
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_DOWNLOAD_OBSERVER_H__