GData downloads cleanup

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__
 #pragma once
 
 #include <map>
 
@@ skipping 11 matching lines @@
 
 // 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();
   virtual ~GDataDownloadObserver();
 
   // Become an observer of  DownloadManager.
-  void Initialize(const FilePath& temp_download_path,
-                  GDataUploader* gdata_uploader,
-                  content::DownloadManager* download_manager);
+  void Initialize(GDataUploader* gdata_uploader,
+                  content::DownloadManager* download_manager,
+                  const FilePath& gdata_tmp_download_path);
 
   // Sets gdata path, for example, '/special/gdata/MyFolder/MyFile',
   // to external data in |download|.
   static void SetGDataPath(content::DownloadItem* download,
                            const FilePath& gdata_path);
 
   // Checks if there is a GData upload associated with |download|
   static bool IsGDataDownload(content::DownloadItem* download);
 
   // Checks if |download| is ready to complete. Returns true if |download| has
@@ skipping 41 matching lines @@
   // Starts the upload of a downloaded/downloading file.
   void UploadDownloadItem(content::DownloadItem* download);
 
   // 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*.
-  UploadFileInfo* CreateUploadFileInfo(content::DownloadItem* download);
+  scoped_ptr<UploadFileInfo> CreateUploadFileInfo(
+      content::DownloadItem* download);
 
   // Callback invoked by GDataUploader when the upload associated with
   // |download_id| has completed. |error| indicated whether the
   // call was successful. This function invokes the MaybeCompleteDownload()
   // method on the DownloadItem to allow it to complete.
-  void OnUploadComplete(int32 download_id, base::PlatformFileError error,
-                        DocumentEntry* unused_entry);
+  void OnUploadComplete(int32 download_id,
+                        base::PlatformFileError error,
+                        UploadFileInfo* upload_file_info);
 
   // Private data.
   // Use GDataUploader to trigger file uploads.
   GDataUploader* gdata_uploader_;
   // Observe the DownloadManager for new downloads.
   content::DownloadManager* download_manager_;
 
+  // Temporary download location directory.
+  FilePath gdata_tmp_download_path_;
+
+  // Map of pending downloads.
   typedef std::map<int32, content::DownloadItem*> DownloadMap;
   DownloadMap pending_downloads_;
 
   base::WeakPtrFactory<GDataDownloadObserver> weak_ptr_factory_;
 
-  // Temporary download location directory.
-  FilePath temp_download_path_;
-
   DISALLOW_COPY_AND_ASSIGN(GDataDownloadObserver);
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_DOWNLOAD_OBSERVER_H__