1 files changed, 40 insertions, 36 deletions

diff --git a/chrome/browser/google_apis/gdata_wapi_service.h b/chrome/browser/google_apis/gdata_wapi_service.h
index d6822a1..c0ca0c4 100644
--- a/chrome/browser/google_apis/gdata_wapi_service.h
+++ b/chrome/browser/google_apis/gdata_wapi_service.h
@@ -18,7 +18,7 @@ class FilePath;
 class GURL;
 class Profile;
 
-namespace gdata {
+namespace google_apis {
 class AuthService;
 class OperationRunner;
 }
@@ -30,15 +30,15 @@ namespace drive {
 // 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 gdata::AuthServiceObserver,
-                         public gdata::OperationRegistryObserver {
+                         public google_apis::AuthServiceObserver,
+                         public google_apis::OperationRegistryObserver {
  public:
   // Instance is usually created by DriveSystemServiceFactory and owned by
   // DriveFileSystem.
   GDataWapiService();
   virtual ~GDataWapiService();
 
-  gdata::AuthService* auth_service_for_testing();
+  google_apis::AuthService* auth_service_for_testing();
 
   // DriveServiceInterface Overrides
   virtual void Initialize(Profile* profile) OVERRIDE;
@@ -47,82 +47,86 @@ class GDataWapiService : public DriveServiceInterface,
   virtual bool CanStartOperation() const OVERRIDE;
   virtual void CancelAll() OVERRIDE;
   virtual bool CancelForFilePath(const FilePath& file_path) OVERRIDE;
-  virtual gdata::OperationProgressStatusList GetProgressStatusList()
+  virtual google_apis::OperationProgressStatusList GetProgressStatusList()
       const OVERRIDE;
   virtual void Authenticate(
-      const gdata::AuthStatusCallback& callback) OVERRIDE;
+      const google_apis::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 gdata::GetDataCallback& callback) OVERRIDE;
+  virtual void GetDocuments(
+      const GURL& feed_url,
+      int64 start_changestamp,
+      const std::string& search_query,
+      const std::string& directory_resource_id,
+      const google_apis::GetDataCallback& callback) OVERRIDE;
   virtual void GetDocumentEntry
   (const std::string& resource_id,
-   const gdata::GetDataCallback& callback) OVERRIDE;
+   const google_apis::GetDataCallback& callback) OVERRIDE;
 
   virtual void GetAccountMetadata(
-      const gdata::GetDataCallback& callback) OVERRIDE;
+      const google_apis::GetDataCallback& callback) OVERRIDE;
   virtual void GetApplicationInfo(
-      const gdata::GetDataCallback& callback) OVERRIDE;
+      const google_apis::GetDataCallback& callback) OVERRIDE;
   virtual void DeleteDocument(
       const GURL& document_url,
-      const gdata::EntryActionCallback& callback) OVERRIDE;
+      const google_apis::EntryActionCallback& callback) OVERRIDE;
   virtual void DownloadDocument(
       const FilePath& virtual_path,
       const FilePath& local_cache_path,
       const GURL& content_url,
       DocumentExportFormat format,
-      const gdata::DownloadActionCallback& callback) OVERRIDE;
+      const google_apis::DownloadActionCallback& callback) OVERRIDE;
   virtual void DownloadFile(
       const FilePath& virtual_path,
       const FilePath& local_cache_path,
       const GURL& content_url,
-      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 gdata::GetDataCallback& callback) OVERRIDE;
+      const google_apis::DownloadActionCallback& download_action_callback,
+      const google_apis::GetContentCallback& get_content_callback) OVERRIDE;
+  virtual void CopyDocument(
+      const std::string& resource_id,
+      const FilePath::StringType& new_name,
+      const google_apis::GetDataCallback& callback) OVERRIDE;
   virtual void RenameResource(
       const GURL& document_url,
       const FilePath::StringType& new_name,
-      const gdata::EntryActionCallback& callback) OVERRIDE;
+      const google_apis::EntryActionCallback& callback) OVERRIDE;
   virtual void AddResourceToDirectory(
       const GURL& parent_content_url,
       const GURL& resource_url,
-      const gdata::EntryActionCallback& callback) OVERRIDE;
+      const google_apis::EntryActionCallback& callback) OVERRIDE;
   virtual void RemoveResourceFromDirectory(
       const GURL& parent_content_url,
       const GURL& resource_url,
       const std::string& resource_id,
-      const gdata::EntryActionCallback& callback) OVERRIDE;
+      const google_apis::EntryActionCallback& callback) OVERRIDE;
   virtual void CreateDirectory(
       const GURL& parent_content_url,
       const FilePath::StringType& directory_name,
-      const gdata::GetDataCallback& callback) OVERRIDE;
+      const google_apis::GetDataCallback& callback) OVERRIDE;
   virtual void InitiateUpload(
-      const gdata::InitiateUploadParams& params,
-      const gdata::InitiateUploadCallback& callback) OVERRIDE;
+      const google_apis::InitiateUploadParams& params,
+      const google_apis::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 gdata::GetDataCallback& callback) OVERRIDE;
+      const google_apis::ResumeUploadParams& params,
+      const google_apis::ResumeUploadCallback& callback) OVERRIDE;
+  virtual void AuthorizeApp(
+      const GURL& resource_url,
+      const std::string& app_id,
+      const google_apis::GetDataCallback& callback) OVERRIDE;
 
  private:
-  gdata::OperationRegistry* operation_registry() const;
+  google_apis::OperationRegistry* operation_registry() const;
 
   // AuthService::Observer override.
   virtual void OnOAuth2RefreshTokenChanged() OVERRIDE;
 
   // DriveServiceObserver Overrides
   virtual void OnProgressUpdate(
-      const gdata::OperationProgressStatusList& list) OVERRIDE;
-  virtual void OnAuthenticationFailed(gdata::GDataErrorCode error) OVERRIDE;
+      const google_apis::OperationProgressStatusList& list) OVERRIDE;
+  virtual void OnAuthenticationFailed(
+      google_apis::GDataErrorCode error) OVERRIDE;
 
-  scoped_ptr<gdata::OperationRunner> runner_;
+  scoped_ptr<google_apis::OperationRunner> runner_;
   ObserverList<DriveServiceObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(GDataWapiService);