drive: Rename 'gdata' namespace to 'drive' in chrome/browser/chromeos/drive

chrome/browser/chromeos/drive/gdata_wapi_service.h

Index: chrome/browser/chromeos/drive/gdata_wapi_service.h
diff --git a/chrome/browser/chromeos/drive/gdata_wapi_service.h b/chrome/browser/chromeos/drive/gdata_wapi_service.h
index 7a51d287b59c73aac635a4a7683759bc11e502e7..e36d3ca534bd8172587f3819b51b4ced98a26022 100644
--- a/chrome/browser/chromeos/drive/gdata_wapi_service.h
+++ b/chrome/browser/chromeos/drive/gdata_wapi_service.h
@@ -19,24 +19,26 @@ class GURL;
 class Profile;
 
 namespace gdata {
-
 class AuthService;
 class OperationRunner;
+}
+
+namespace drive {
 
 // This class provides documents feed service calls for WAPI (codename for
 // DocumentsList API).
 // Details of API call are abstracted in each operation class and this class
 // works as a thin wrapper for the API.
 class GDataWapiService : public DriveServiceInterface,
-                         public AuthServiceObserver,
-                         public OperationRegistryObserver {
+                         public gdata::AuthServiceObserver,
+                         public gdata::OperationRegistryObserver {
  public:
   // Instance is usually created by DriveSystemServiceFactory and owned by
   // DriveFileSystem.
   GDataWapiService();
   virtual ~GDataWapiService();
 
-  AuthService* auth_service_for_testing();
+  gdata::AuthService* auth_service_for_testing();
 
   // DriveServiceInterface Overrides
   virtual void Initialize(Profile* profile) OVERRIDE;
@@ -45,77 +47,88 @@ class GDataWapiService : public DriveServiceInterface,
   virtual bool CanStartOperation() const OVERRIDE;
   virtual void CancelAll() OVERRIDE;
   virtual bool CancelForFilePath(const FilePath& file_path) OVERRIDE;
-  virtual OperationProgressStatusList GetProgressStatusList() const OVERRIDE;
-  virtual void Authenticate(const AuthStatusCallback& callback) OVERRIDE;
+  virtual gdata::OperationProgressStatusList GetProgressStatusList()
+      const OVERRIDE;
+  virtual void Authenticate(
+      const gdata::AuthStatusCallback& callback) OVERRIDE;
   virtual bool HasAccessToken() const OVERRIDE;
   virtual bool HasRefreshToken() const OVERRIDE;
   virtual void GetDocuments(const GURL& feed_url,
                             int64 start_changestamp,
                             const std::string& search_query,
                             const std::string& directory_resource_id,
-                            const GetDataCallback& callback) OVERRIDE;
-  virtual void GetDocumentEntry(const std::string& resource_id,
-                                const GetDataCallback& callback) OVERRIDE;
-
-  virtual void GetAccountMetadata(const GetDataCallback& callback) OVERRIDE;
-  virtual void GetApplicationInfo(const GetDataCallback& callback) OVERRIDE;
-  virtual void DeleteDocument(const GURL& document_url,
-                              const EntryActionCallback& callback) OVERRIDE;
+                            const gdata::GetDataCallback& callback) OVERRIDE;
+  virtual void GetDocumentEntry
+  (const std::string& resource_id,
+   const gdata::GetDataCallback& callback) OVERRIDE;
+
+  virtual void GetAccountMetadata(
+      const gdata::GetDataCallback& callback) OVERRIDE;
+  virtual void GetApplicationInfo(
+      const gdata::GetDataCallback& callback) OVERRIDE;
+  virtual void DeleteDocument(
+      const GURL& document_url,
+      const gdata::EntryActionCallback& callback) OVERRIDE;
   virtual void DownloadDocument(
       const FilePath& virtual_path,
       const FilePath& local_cache_path,
       const GURL& content_url,
       DocumentExportFormat format,
-      const DownloadActionCallback& callback) OVERRIDE;
+      const gdata::DownloadActionCallback& callback) OVERRIDE;
   virtual void DownloadFile(
       const FilePath& virtual_path,
       const FilePath& local_cache_path,
       const GURL& content_url,
-      const DownloadActionCallback& download_action_callback,
-      const GetContentCallback& get_content_callback) OVERRIDE;
+      const gdata::DownloadActionCallback& download_action_callback,
+      const gdata::GetContentCallback& get_content_callback) OVERRIDE;
   virtual void CopyDocument(const std::string& resource_id,
                             const FilePath::StringType& new_name,
-                            const GetDataCallback& callback) OVERRIDE;
-  virtual void RenameResource(const GURL& document_url,
-                              const FilePath::StringType& new_name,
-                              const EntryActionCallback& callback) OVERRIDE;
+                            const gdata::GetDataCallback& callback) OVERRIDE;
+  virtual void RenameResource(
+      const GURL& document_url,
+      const FilePath::StringType& new_name,
+      const gdata::EntryActionCallback& callback) OVERRIDE;
   virtual void AddResourceToDirectory(
       const GURL& parent_content_url,
       const GURL& resource_url,
-      const EntryActionCallback& callback) OVERRIDE;
+      const gdata::EntryActionCallback& callback) OVERRIDE;
   virtual void RemoveResourceFromDirectory(
       const GURL& parent_content_url,
       const GURL& resource_url,
       const std::string& resource_id,
-      const EntryActionCallback& callback) OVERRIDE;
-  virtual void CreateDirectory(const GURL& parent_content_url,
-                               const FilePath::StringType& directory_name,
-                               const GetDataCallback& callback) OVERRIDE;
-  virtual void InitiateUpload(const InitiateUploadParams& params,
-                              const InitiateUploadCallback& callback) OVERRIDE;
-  virtual void ResumeUpload(const ResumeUploadParams& params,
-                            const ResumeUploadCallback& callback) OVERRIDE;
+      const gdata::EntryActionCallback& callback) OVERRIDE;
+  virtual void CreateDirectory(
+      const GURL& parent_content_url,
+      const FilePath::StringType& directory_name,
+      const gdata::GetDataCallback& callback) OVERRIDE;
+  virtual void InitiateUpload(
+      const gdata::InitiateUploadParams& params,
+      const gdata::InitiateUploadCallback& callback) OVERRIDE;
+  virtual void ResumeUpload(
+      const gdata::ResumeUploadParams& params,
+      const gdata::ResumeUploadCallback& callback) OVERRIDE;
   virtual void AuthorizeApp(const GURL& resource_url,
                             const std::string& app_id,
-                            const GetDataCallback& callback) OVERRIDE;
+                            const gdata::GetDataCallback& callback) OVERRIDE;
 
  private:
-  OperationRegistry* operation_registry() const;
+  gdata::OperationRegistry* operation_registry() const;
 
   // AuthService::Observer override.
   virtual void OnOAuth2RefreshTokenChanged() OVERRIDE;
 
   // DriveServiceObserver Overrides
   virtual void OnProgressUpdate(
-      const OperationProgressStatusList& list) OVERRIDE;
-  virtual void OnAuthenticationFailed(GDataErrorCode error) OVERRIDE;
+      const gdata::OperationProgressStatusList& list) OVERRIDE;
+  virtual void OnAuthenticationFailed(gdata::GDataErrorCode error) OVERRIDE;
 
-  scoped_ptr<OperationRunner> runner_;
+  Profile* profile_;

[hashimoto, 2012/10/12 04:57:46]

Why are you adding this?

[satorux1, 2012/10/12 05:32:56]

This was removed by tzik. Somehow my patch got it back... Removed again.

+  scoped_ptr<gdata::OperationRunner> runner_;
   ObserverList<DriveServiceObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(GDataWapiService);
 };
 
-}  // namespace gdata
+}  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_GDATA_WAPI_SERVICE_H_