Rename GDataUplaoder to DriveUploader

chrome/browser/chromeos/gdata/drive_file_system.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_DRIVE_FILE_SYSTEM_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_FILE_SYSTEM_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 14 matching lines @@
 #include "content/public/browser/notification_observer.h"
 
 namespace base {
 class SequencedTaskRunner;
 }
 
 namespace gdata {
 
 class DriveFunctionRemove;
 class DriveServiceInterface;
+class DriveUploaderInterface;
 class DriveWebAppsRegistryInterface;
-class GDataUploaderInterface;
 class GDataWapiFeedLoader;
 struct UploadFileInfo;
 
 // The production implementation of DriveFileSystemInterface.
 class DriveFileSystem : public DriveFileSystemInterface,
                         public GDataWapiFeedLoader::Observer,
                         public content::NotificationObserver {
  public:
   DriveFileSystem(Profile* profile,
                   DriveCache* cache,
                   DriveServiceInterface* drive_service,
-                  GDataUploaderInterface* uploader,
+                  DriveUploaderInterface* uploader,
                   DriveWebAppsRegistryInterface* webapps_registry,
                   base::SequencedTaskRunner* blocking_task_runner);
   virtual ~DriveFileSystem();
 
   // DriveFileSystem overrides.
   virtual void Initialize() OVERRIDE;
   virtual void AddObserver(
       DriveFileSystemInterface::Observer* observer) OVERRIDE;
   virtual void RemoveObserver(
       DriveFileSystemInterface::Observer* observer) OVERRIDE;
@@ skipping 680 matching lines @@
   // Part of UpdateFileByResourceId().
   // Callback for getting the size of the cache file in the blocking pool.
   // |callback| must not be null.
   void OnGetFileSizeCompleteForUpdateFile(const FileOperationCallback& callback,
                                           const std::string& resource_id,
                                           const FilePath& cache_file_path,
                                           DriveFileError* error,
                                           int64* file_size);
 
   // Part of UpdateFileByResourceId().
-  // Callback for GDataRootDirectory::GetEntryInfoByResourceId.
+  // Callback for DriveRootDirectory::GetEntryInfoByResourceId.
   // |callback| must not be null.
   void OnGetFileCompleteForUpdateFileByEntry(
       const FileOperationCallback& callback,
       int64 file_size,
       const FilePath& cache_file_path,
       DriveFileError error,
       const FilePath& drive_file_path,
       scoped_ptr<DriveEntryProto> entry_proto);
 
   // Part of UpdateFileByResourceId().
-  // Called when GDataUploader::UploadUpdatedFile() is completed for
+  // Called when DriveUploader::UploadUpdatedFile() is completed for
   // UpdateFileByResourceId().
   // |callback| must not be null.
   void OnUpdatedFileUploaded(const FileOperationCallback& callback,
                              DriveFileError error,
                              scoped_ptr<UploadFileInfo> upload_file_info);
 
   // The following functions are used to forward calls to asynchronous public
   // member functions to UI thread.
   void SearchAsyncOnUIThread(const std::string& search_query,
                              const GURL& next_feed,
@@ skipping 136 matching lines @@
   // other threads with base::Unretained(this).
   scoped_ptr<DriveResourceMetadata> resource_metadata_;
 
   // The profile hosts the DriveFileSystem via DriveSystemService.
   Profile* profile_;
 
   // The cache owned by DriveSystemService.
   DriveCache* cache_;
 
   // The uploader owned by DriveSystemService.
-  GDataUploaderInterface* uploader_;
+  DriveUploaderInterface* uploader_;
 
   // The document service owned by DriveSystemService.
   DriveServiceInterface* drive_service_;
 
   // The webapps registry owned by DriveSystemService.
   DriveWebAppsRegistryInterface* webapps_registry_;
 
   // Periodic timer for checking updates.
   base::Timer update_timer_;
 
@@ skipping 19 matching lines @@
   // invalidate the weak pointers before any other members are destroyed.
   base::WeakPtrFactory<DriveFileSystem> ui_weak_ptr_factory_;
   // Unlike other classes, we need this as we need this to redirect a task
   // from IO thread to UI thread.
   base::WeakPtr<DriveFileSystem> ui_weak_ptr_;
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_DRIVE_FILE_SYSTEM_H_