gdata: Stop getting GDataUploader via GDataSystemService

chrome/browser/chromeos/gdata/gdata_uploader.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_UPLOADER_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_UPLOADER_H_
 #pragma once
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/weak_ptr.h"
 #include "base/platform_file.h"
 #include "chrome/browser/chromeos/gdata/gdata_errorcode.h"
 #include "chrome/browser/chromeos/gdata/gdata_params.h"
 #include "googleurl/src/gurl.h"
 
 namespace content {
 class DownloadItem;
 }
 
 namespace gdata {
 
 class GDataFileSystem;
 class DocumentsServiceInterface;
 struct UploadFileInfo;
 
-class GDataUploader {
+class GDataUploaderInterface {
  public:
-  explicit GDataUploader(GDataFileSystem* file_system,
-                         DocumentsServiceInterface* documents_service);
-  virtual ~GDataUploader();
+  ~GDataUploaderInterface() {}
 
   // Uploads a file specified by |upload_file_info|. Transfers ownership.
   // Returns the upload_id.
-  int UploadFile(scoped_ptr<UploadFileInfo> upload_file_info);
+  //
+  // WARNING: This is not mockable by gmock because it takes scoped_ptr<>.
+  // See "Announcing scoped_ptr<>::Pass(). The latest in pointer ownership
+  // technology!" thread on chromium-dev.
+  virtual int UploadFile(scoped_ptr<UploadFileInfo> upload_file_info) = 0;
 
   // Updates attributes of streaming upload.
-  void UpdateUpload(int upload_id, content::DownloadItem* download);
+  virtual void UpdateUpload(int upload_id,
+                            content::DownloadItem* download) = 0;
 
   // Returns the count of bytes confirmed as uploaded so far.
-  int64 GetUploadedBytes(int upload_id) const;
+  virtual int64 GetUploadedBytes(int upload_id) const = 0;
+};
+
+class GDataUploader : public GDataUploaderInterface {
+ public:
+  explicit GDataUploader(DocumentsServiceInterface* documents_service);
+  virtual ~GDataUploader();
+
+  // Sets the file system. This must be called before calling other member
+  // functions.
+  //
+  // TODO(satorux): The dependency to GDataFileSystem should be
+  // eliminated. http://crbug.com/133860
+  void set_file_system(GDataFileSystem* file_system) {
+    file_system_ = file_system;
+  }
+
+  // GDataUploaderInterface overrides.
+  virtual int UploadFile(scoped_ptr<UploadFileInfo> upload_file_info);
+  virtual void UpdateUpload(int upload_id, content::DownloadItem* download);
+  virtual int64 GetUploadedBytes(int upload_id) const;
 
  private:
   // Lookup UploadFileInfo* in pending_uploads_.
   UploadFileInfo* GetUploadFileInfo(int upload_id) const;
 
   // Open the file.
   void OpenFile(UploadFileInfo* upload_file_info);
 
   // net::FileStream::Open completion callback. The result of the file
   // open operation is passed as |result|.
@@ skipping 42 matching lines @@
 
   // Factory for various callbacks.
   base::WeakPtrFactory<GDataUploader> uploader_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GDataUploader);
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_UPLOADER_H_