gdata: Stop getting GDataUploader via GDataSystemService

chrome/browser/chromeos/gdata/gdata_file_system.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_file_system.h"
 
 #include <set>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 674 matching lines @@
 
 GDataFileSystem::GetFileFromCacheParams::~GetFileFromCacheParams() {
 }
 
 // GDataFileSystem class implementation.
 
 GDataFileSystem::GDataFileSystem(
     Profile* profile,
     GDataCache* cache,
     DocumentsServiceInterface* documents_service,
+    GDataUploaderInterface* uploader,
     const base::SequencedWorkerPool::SequenceToken& sequence_token)
     : profile_(profile),
       cache_(cache),
+      uploader_(uploader),
       documents_service_(documents_service),
       update_timer_(true /* retain_user_task */, true /* is_repeating */),
       hide_hosted_docs_(false),
       ui_weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       ui_weak_ptr_(ui_weak_ptr_factory_.GetWeakPtr()),
       sequence_token_(sequence_token) {
   // Should be created from the file browser extension API on UI thread.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
@@ skipping 412 matching lines @@
 void GDataFileSystem::StartFileUploadOnUIThread(
     const FileOperationCallback& callback,
     base::PlatformFileError* error,
     UploadFileInfo* upload_file_info) {
   // This method needs to run on the UI thread as required by
   // GDataUploader::UploadFile().
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(error);
   DCHECK(upload_file_info);
 
-  GDataSystemService* service =
-      GDataSystemServiceFactory::GetForProfile(profile_);
-
-  if (*error == base::PLATFORM_FILE_OK) {
-    if (!service)
-      *error = base::PLATFORM_FILE_ERROR_FAILED;
-  }
-
   if (*error != base::PLATFORM_FILE_OK) {
     if (!callback.is_null())
       callback.Run(*error);
 
     return;
   }
 
   upload_file_info->completion_callback =
       base::Bind(&GDataFileSystem::OnTransferCompleted,
                  ui_weak_ptr_,
                  callback);
 
-  service->uploader()->UploadFile(scoped_ptr<UploadFileInfo>(upload_file_info));
+  uploader_->UploadFile(scoped_ptr<UploadFileInfo>(upload_file_info));
 }
 
 void GDataFileSystem::OnTransferCompleted(
     const FileOperationCallback& callback,
     base::PlatformFileError error,
     scoped_ptr<UploadFileInfo> upload_file_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(upload_file_info.get());
 
   if (error == base::PLATFORM_FILE_OK && upload_file_info->entry.get()) {
@@ skipping 2558 matching lines @@
   // must go through here. Removes the |file_path| from the remembered set so
   // that subsequent operations can open the file again.
   open_files_.erase(file_path);
 
   // Then invokes the user-supplied callback function.
   if (!callback.is_null())
     callback.Run(result);
 }
 
 }  // namespace gdata