gdata cleanup: Make GDataFileSystem::AddUploadedFile() take scoped_ptr<DocumentEntry>.

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 501 matching lines @@
 
 void GDataDownloadObserver::MoveFileToGDataCache(DownloadItem* download) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   UploadingExternalData* data = GetUploadingExternalData(download);
   if (!data) {
     NOTREACHED();
     return;
   }
 
-  // Take ownership of the DocumentEntry object. It will be released upon
-  // completion of the AddUploadedFile() call below.
-  DocumentEntry* entry = data->entry_passed().release();
-  if (!entry) {
+  // Pass ownership of the DocumentEntry object to AddUploadedFile().
+  scoped_ptr<DocumentEntry> entry = data->entry_passed();
+  if (!entry.get()) {
     NOTREACHED();
     return;
   }
 
   // Move downloaded file to gdata cache. Note that |content_file_path| should
   // use the final target path when the download item is in COMPLETE state.
   file_system_->AddUploadedFile(UPLOAD_NEW_FILE,
                                 data->virtual_dir_path(),
-                                entry,
+                                entry.Pass(),
                                 download->GetTargetFilePath(),
                                 GDataCache::FILE_OPERATION_MOVE,
-                                base::Bind(&base::DeletePointer<DocumentEntry>,
-                                           entry));
+                                base::Bind(&base::DoNothing));
 }
 
 }  // namespace gdata