Make DownloadItem derive SupportsUserData instead of re-implementing it.

chrome/browser/chromeos/gdata/gdata_download_observer.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_download_observer.h"
 
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "chrome/browser/chromeos/gdata/gdata.pb.h"
 #include "chrome/browser/chromeos/gdata/gdata_documents_service.h"
@@ skipping 40 matching lines @@
  private:
   GDataUploader* uploader_;
   int upload_id_;
   FilePath virtual_dir_path_;
   scoped_ptr<DocumentEntry> entry_;
 
   DISALLOW_COPY_AND_ASSIGN(UploadingExternalData);
 };
 
 // External Data stored in DownloadItem for gdata path.
-class GDataExternalData : public DownloadItem::ExternalData {
+class GDataExternalData : public base::SupportsUserData::Data {

[achuithb, 2012/08/07 17:43:27]

Shouldn't we be including base/supports_user_data.h in this file instead of
relying on transitive inclusion?

[benjhayden, 2012/08/07 18:24:34]

Done.

  public:
   explicit GDataExternalData(const FilePath& path) : file_path_(path) {}
   virtual ~GDataExternalData() {}
 
   const FilePath& file_path() const { return file_path_; }
 
  private:
   FilePath file_path_;
 };
 
 // Extracts UploadingExternalData* from |download|.
 UploadingExternalData* GetUploadingExternalData(DownloadItem* download) {
   return static_cast<UploadingExternalData*>(
-      download->GetExternalData(&kUploadingKey));
+      download->GetUserData(&kUploadingKey));
 }
 
 // Extracts GDataExternalData* from |download|.
 GDataExternalData* GetGDataExternalData(DownloadItem* download) {
   return static_cast<GDataExternalData*>(
-      download->GetExternalData(&kGDataPathKey));
+      download->GetUserData(&kGDataPathKey));
 }
 
 void RunSubstituteGDataDownloadCallback(
     const GDataDownloadObserver::SubstituteGDataDownloadPathCallback& callback,
     const FilePath* file_path) {
   callback.Run(*file_path);
 }
 
 gdata::GDataSystemService* GetSystemService(Profile* profile) {
   gdata::GDataSystemService* system_service =
@@ skipping 134 matching lines @@
   }
 }
 
 // static
 void GDataDownloadObserver::SetDownloadParams(const FilePath& gdata_path,
                                               DownloadItem* download) {
   if (!download)
     return;
 
   if (gdata::util::IsUnderGDataMountPoint(gdata_path)) {
-    download->SetExternalData(&kGDataPathKey,
-                              new GDataExternalData(gdata_path));
+    download->SetUserData(&kGDataPathKey,
+                          new GDataExternalData(gdata_path));
     download->SetDisplayName(gdata_path.BaseName());
     download->SetIsTemporary(true);
   } else if (IsGDataDownload(download)) {
     // This may have been previously set if the default download folder is
     // /drive, and the user has now changed the download target to a local
     // folder.
-    download->SetExternalData(&kGDataPathKey, NULL);
+    download->SetUserData(&kGDataPathKey, NULL);
     download->SetDisplayName(gdata_path);
     // TODO(achuith): This is not quite right.
     download->SetIsTemporary(false);
   }
 }
 
 // static
 FilePath GDataDownloadObserver::GetGDataPath(DownloadItem* download) {
   GDataExternalData* data = GetGDataExternalData(download);
   // If data is NULL, we've somehow lost the gdata path selected by the file
@@ skipping 138 matching lines @@
   DCHECK(!download->IsInProgress());
 
   DownloadMap::iterator it = pending_downloads_.find(download->GetId());
   if (it != pending_downloads_.end()) {
     DetachFromDownload(download);
     pending_downloads_.erase(it);
   }
 }
 
 void GDataDownloadObserver::DetachFromDownload(DownloadItem* download) {
-  download->SetExternalData(&kUploadingKey, NULL);
-  download->SetExternalData(&kGDataPathKey, NULL);
+  download->SetUserData(&kUploadingKey, NULL);
+  download->SetUserData(&kGDataPathKey, NULL);
   download->RemoveObserver(this);
 }
 
 void GDataDownloadObserver::UploadDownloadItem(DownloadItem* download) {
   // Update metadata of ongoing upload.
   UpdateUpload(download);
 
   if (!ShouldUpload(download))
     return;
 
   // Initialize uploading external data.
-  download->SetExternalData(&kUploadingKey,
+  download->SetUserData(&kUploadingKey,
                             new UploadingExternalData(gdata_uploader_));
 
   // Create UploadFileInfo structure for the download item.
   CreateUploadFileInfo(download);
 }
 
 void GDataDownloadObserver::UpdateUpload(DownloadItem* download) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   UploadingExternalData* upload_data = GetUploadingExternalData(download);
@@ skipping 143 matching lines @@
   // use the final target path when the download item is in COMPLETE state.
   file_system_->AddUploadedFile(UPLOAD_NEW_FILE,
                                 upload_data->virtual_dir_path(),
                                 entry.Pass(),
                                 download->GetTargetFilePath(),
                                 GDataCache::FILE_OPERATION_MOVE,
                                 base::Bind(&base::DoNothing));
 }
 
 }  // namespace gdata