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

chrome/browser/chromeos/gdata/gdata_uploader.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_uploader.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 149 matching lines @@
   // Retry opening this file if we failed before.  File open can fail because
   // the downloads system sets the full path on the UI thread and schedules a
   // rename on the FILE thread. Thus the new path is visible on the UI thread
   // before the renamed file is available on the file system.
   if (upload_file_info->should_retry_file_open) {
     DCHECK(!download->IsComplete());
     // Disallow further retries.
     upload_file_info->should_retry_file_open = false;
     OpenFile(upload_file_info);
   }
-
-  if (download->IsComplete())
-    MoveFileToCache(upload_file_info);
 }
 
 int64 GDataUploader::GetUploadedBytes(int upload_id) const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   UploadFileInfo* upload_info = GetUploadFileInfo(upload_id);
   // We return the start_range as the count of uploaded bytes since that is the
   // start of the next or currently uploading chunk.
   // TODO(asanka): Use a finer grained progress value than this. We end up
   //               reporting progress in kUploadChunkSize increments.
   return upload_info ? upload_info->start_range : 0;
@@ skipping 296 matching lines @@
   }
 
   DVLOG(1) << "Received range " << response.start_range_received
            << "-" << response.end_range_received
            << " for [" << upload_file_info->title << "]";
 
   // Continue uploading.
   UploadNextChunk(upload_file_info);
 }
 
-void GDataUploader::MoveFileToCache(UploadFileInfo* upload_file_info) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (upload_file_info->entry == NULL)
-    return;
-
-  // Remove |upload_id| from the UploadFileInfoMap. The UploadFileInfo object
-  // will be deleted upon completion of AddUploadedFile.
-  RemoveUpload(upload_file_info->upload_id);
-
-  DVLOG(1) << "MoveFileToCache " << upload_file_info->file_path.value();
-  file_system_->AddUploadedFile(
-      UPLOAD_NEW_FILE,
-      upload_file_info->gdata_path.DirName(),
-      upload_file_info->entry.get(),
-      upload_file_info->file_path,
-      GDataCache::FILE_OPERATION_MOVE,
-      base::Bind(&base::DeletePointer<UploadFileInfo>,
-                 upload_file_info));
-}
-
 void GDataUploader::UploadFailed(scoped_ptr<UploadFileInfo> upload_file_info,
                                  base::PlatformFileError error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   RemoveUpload(upload_file_info->upload_id);
 
   LOG(ERROR) << "Upload failed " << upload_file_info->DebugString();
   // This is subtle but we should take the callback reference before
   // calling upload_file_info.Pass(). Otherwise, it'll crash.
   const UploadFileInfo::UploadCompletionCallback& callback =
       upload_file_info->completion_callback;
   if (!callback.is_null())
     callback.Run(error, upload_file_info.Pass());
 }
 
 void GDataUploader::RemoveUpload(int upload_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   pending_uploads_.erase(upload_id);
 }
 
 }  // namespace gdata