gdata: Move GDataFileSystem::AddUploadedFile() call out of uploader and into GDataDownloadObserver.

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>
 
 #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"
 
 class Profile;
 
 namespace gdata {
 
 class DocumentEntry;
+class GDataFileSystem;
 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();
+  GDataDownloadObserver(GDataUploader* uploader, GDataFileSystem* file_system);
   virtual ~GDataDownloadObserver();
 
   // Become an observer of  DownloadManager.
-  void Initialize(GDataUploader* gdata_uploader,
-                  content::DownloadManager* download_manager,
+  void Initialize(content::DownloadManager* download_manager,
                   const FilePath& gdata_tmp_download_path);
 
   typedef base::Callback<void(const FilePath&)>
     SubstituteGDataDownloadPathCallback;
   static void SubstituteGDataDownloadPath(Profile* profile,
       const FilePath& gdata_path, content::DownloadItem* download,
       const SubstituteGDataDownloadPathCallback& callback);
 
   // Sets gdata path, for example, '/special/drive/MyFolder/MyFile',
   // to external data in |download|. Also sets display name and
@@ skipping 61 matching lines @@
 
   // Checks if this DownloadItem should be uploaded.
   bool ShouldUpload(content::DownloadItem* download);
 
   // Creates UploadFileInfo and initializes it using DownloadItem*.
   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.
+  // 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.

[asanka, 2012/07/11 15:56:52]

Nit: This doesn't call MaybeCompleteDownload() anymore. Instead it runs a
completion callback to allow the download item to complete.

   void OnUploadComplete(int32 download_id,
                         base::PlatformFileError error,
                         scoped_ptr<UploadFileInfo> upload_file_info);
 
+  // Moves the downloaded file to gdata cache.
+  // Must be called after GDataDownloadObserver receives COMPLETE notification.
+  void MoveFileToGDataCache(content::DownloadItem* download);
+
   // Private data.
-  // Use GDataUploader to trigger file uploads.
+  // The uploader owned by GDataSystemService. Used to trigger file uploads.
   GDataUploader* gdata_uploader_;
+  // The file system owned by GDataSystemService.
+  GDataFileSystem* file_system_;
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(GDataDownloadObserver);
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_DOWNLOAD_OBSERVER_H__