Rename GDataUplaoder to DriveUploader

chrome/browser/chromeos/gdata/drive_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_
+#ifndef CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_UPLOADER_H_
+#define CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_UPLOADER_H_
 
 #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/drive_upload_file_info.h"
 #include "chrome/browser/chromeos/gdata/gdata_errorcode.h"
 #include "chrome/browser/chromeos/gdata/gdata_operations.h"
-#include "chrome/browser/chromeos/gdata/gdata_upload_file_info.h"
 #include "googleurl/src/gurl.h"
 
 namespace content {
 class DownloadItem;
 }
 
 namespace gdata {
 
 class DriveServiceInterface;
 
-class GDataUploaderInterface {
+class DriveUploaderInterface {
  public:
-  virtual ~GDataUploaderInterface() {}
+  virtual ~DriveUploaderInterface() {}
 
   // Uploads a new file specified by |upload_file_info|. Transfers ownership.
   // Returns the upload_id.
   //
   // 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 UploadNewFile(scoped_ptr<UploadFileInfo> upload_file_info) = 0;
 
   // Stream data to an existing file from data specified by |upload_file_info|.
@@ skipping 15 matching lines @@
       const UploadFileInfo::UploadCompletionCallback& callback) = 0;
 
   // Updates attributes of streaming upload.
   virtual void UpdateUpload(int upload_id,
                             content::DownloadItem* download) = 0;
 
   // Returns the count of bytes confirmed as uploaded so far.
   virtual int64 GetUploadedBytes(int upload_id) const = 0;
 };
 
-class GDataUploader : public GDataUploaderInterface {
+class DriveUploader : public DriveUploaderInterface {
  public:
-  explicit GDataUploader(DriveServiceInterface* drive_service);
-  virtual ~GDataUploader();
+  explicit DriveUploader(DriveServiceInterface* drive_service);
+  virtual ~DriveUploader();
 
-  // GDataUploaderInterface overrides.
+  // DriveUploaderInterface overrides.
   virtual int UploadNewFile(
       scoped_ptr<UploadFileInfo> upload_file_info) OVERRIDE;
   virtual int StreamExistingFile(
       scoped_ptr<UploadFileInfo> upload_file_info) OVERRIDE;
   virtual int UploadExistingFile(
       const GURL& upload_location,
       const FilePath& gdata_file_path,
       const FilePath& local_file_path,
       int64 file_size,
       const std::string& content_type,
@@ skipping 45 matching lines @@
   // Note that this does not delete the UploadFileInfo object itself,
   // because it may still be in use by an asynchronous function.
   void RemoveUpload(int upload_id);
 
   // Starts uploading a file with |upload_file_info|. Returns a new upload
   // ID assigned to |upload_file_info|.
   int StartUploadFile(scoped_ptr<UploadFileInfo> upload_file_info);
 
   // Pointers to DriveServiceInterface object owned by DriveSystemService.
   // The lifetime of this object is guaranteed to exceed that of the
-  // GDataUploader instance.
+  // DriveUploader instance.
   DriveServiceInterface* drive_service_;
 
   int next_upload_id_;  // id counter.
 
   typedef std::map<int, UploadFileInfo*> UploadFileInfoMap;
   UploadFileInfoMap pending_uploads_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
-  base::WeakPtrFactory<GDataUploader> weak_ptr_factory_;
+  base::WeakPtrFactory<DriveUploader> weak_ptr_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(GDataUploader);
+  DISALLOW_COPY_AND_ASSIGN(DriveUploader);
 };
 
 }  // namespace gdata
 
-#endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_UPLOADER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_UPLOADER_H_