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

chrome/browser/chromeos/drive/gdata_wapi_service.cc

Index: chrome/browser/chromeos/drive/gdata_wapi_service.cc
diff --git a/chrome/browser/chromeos/drive/gdata_wapi_service.cc b/chrome/browser/chromeos/drive/gdata_wapi_service.cc
index a73f1a743d0ae291851cacdaf287756f33bd5973..e02a8e4f8e8dff7a8c7ca9b07de24afa60029995 100644
--- a/chrome/browser/chromeos/drive/gdata_wapi_service.cc
+++ b/chrome/browser/chromeos/drive/gdata_wapi_service.cc
@@ -19,7 +19,7 @@
 
 using content::BrowserThread;
 
-namespace gdata {
+namespace drive {
 
 namespace {
 
@@ -79,7 +79,7 @@ GDataWapiService::~GDataWapiService() {
   }
 }
 
-AuthService* GDataWapiService::auth_service_for_testing() {
+gdata::AuthService* GDataWapiService::auth_service_for_testing() {
   return runner_->auth_service();
 }
 
@@ -92,7 +92,7 @@ void GDataWapiService::Initialize(Profile* profile) {
   scopes.push_back(kUserContentScope);
   // Drive App scope is required for even WAPI v3 apps access.
   scopes.push_back(kDriveAppsScope);
-  runner_.reset(new OperationRunner(profile, scopes));
+  runner_.reset(new gdata::OperationRunner(profile, scopes));
   runner_->Initialize();
 
   runner_->auth_service()->AddObserver(this);
@@ -123,12 +123,13 @@ bool GDataWapiService::CancelForFilePath(const FilePath& file_path) {
   return operation_registry()->CancelForFilePath(file_path);
 }
 
-OperationProgressStatusList GDataWapiService::GetProgressStatusList() const {
+gdata::OperationProgressStatusList GDataWapiService::GetProgressStatusList()
+    const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return operation_registry()->GetProgressStatusList();
 }
 
-void GDataWapiService::Authenticate(const AuthStatusCallback& callback) {
+void GDataWapiService::Authenticate(const gdata::AuthStatusCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   runner_->Authenticate(callback);
 }
@@ -137,41 +138,44 @@ void GDataWapiService::GetDocuments(const GURL& url,
                                     int64 start_changestamp,
                                     const std::string& search_query,
                                     const std::string& directory_resource_id,
-                                    const GetDataCallback& callback) {
+                                    const gdata::GetDataCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Drive V2 API defines changestamp in int64, while DocumentsList API uses
   // int32. This narrowing should not cause any trouble.
-  GetDocumentsOperation* operation =
-      new GetDocumentsOperation(operation_registry(),
-                                url,
-                                static_cast<int>(start_changestamp),
-                                search_query,
-                                directory_resource_id,
-                                callback);
+  gdata::GetDocumentsOperation* operation =
+      new gdata::GetDocumentsOperation(operation_registry(),
+                                       url,
+                                       static_cast<int>(start_changestamp),
+                                       search_query,
+                                       directory_resource_id,
+                                       callback);
   runner_->StartOperationWithRetry(operation);
 }
 
-void GDataWapiService::GetDocumentEntry(const std::string& resource_id,
-                                        const GetDataCallback& callback) {
+void GDataWapiService::GetDocumentEntry(
+    const std::string& resource_id,
+    const gdata::GetDataCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  GetDocumentEntryOperation* operation =
-      new GetDocumentEntryOperation(operation_registry(),
-                                    resource_id,
-                                    callback);
+  gdata::GetDocumentEntryOperation* operation =
+      new gdata::GetDocumentEntryOperation(operation_registry(),
+                                           resource_id,
+                                           callback);
   runner_->StartOperationWithRetry(operation);
 }
 
-void GDataWapiService::GetAccountMetadata(const GetDataCallback& callback) {
+void GDataWapiService::GetAccountMetadata(
+    const gdata::GetDataCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  GetAccountMetadataOperation* operation =
-      new GetAccountMetadataOperation(operation_registry(), callback);
+  gdata::GetAccountMetadataOperation* operation =
+      new gdata::GetAccountMetadataOperation(operation_registry(), callback);
   runner_->StartOperationWithRetry(operation);
 }
 
-void GDataWapiService::GetApplicationInfo(const GetDataCallback& callback) {
+void GDataWapiService::GetApplicationInfo(
+    const gdata::GetDataCallback& callback) {
   // For WAPI, AccountMetadata includes Drive application information.
   GetAccountMetadata(callback);
 }
@@ -181,132 +185,138 @@ void GDataWapiService::DownloadDocument(
     const FilePath& local_cache_path,
     const GURL& document_url,
     DocumentExportFormat format,
-    const DownloadActionCallback& callback) {
+    const gdata::DownloadActionCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   DownloadFile(
       virtual_path,
       local_cache_path,
       chrome_common_net::AppendQueryParameter(document_url,
-                                               "exportFormat",
-                                               GetExportFormatParam(format)),
+                                              "exportFormat",
+                                              GetExportFormatParam(format)),
       callback,
-      GetContentCallback());
+      gdata::GetContentCallback());
 }
 
 void GDataWapiService::DownloadFile(
-      const FilePath& virtual_path,
-      const FilePath& local_cache_path,
-      const GURL& document_url,
-      const DownloadActionCallback& download_action_callback,
-      const GetContentCallback& get_content_callback) {
+    const FilePath& virtual_path,
+    const FilePath& local_cache_path,
+    const GURL& document_url,
+    const gdata::DownloadActionCallback& download_action_callback,
+    const gdata::GetContentCallback& get_content_callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   runner_->StartOperationWithRetry(
-      new DownloadFileOperation(operation_registry(),
-                                download_action_callback,
-                                get_content_callback, document_url,
-                                virtual_path, local_cache_path));
+      new gdata::DownloadFileOperation(operation_registry(),
+                                       download_action_callback,
+                                       get_content_callback, document_url,
+                                       virtual_path, local_cache_path));
 }
 
-void GDataWapiService::DeleteDocument(const GURL& document_url,
-                                      const EntryActionCallback& callback) {
+void GDataWapiService::DeleteDocument(
+    const GURL& document_url,
+    const gdata::EntryActionCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   runner_->StartOperationWithRetry(
-      new DeleteDocumentOperation(operation_registry(), callback,
-                                  document_url));
+      new gdata::DeleteDocumentOperation(operation_registry(), callback,
+                                         document_url));
 }
 
 void GDataWapiService::CreateDirectory(
     const GURL& parent_content_url,
     const FilePath::StringType& directory_name,
-    const GetDataCallback& callback) {
+    const gdata::GetDataCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   runner_->StartOperationWithRetry(
-      new CreateDirectoryOperation(operation_registry(), callback,
-                                   parent_content_url, directory_name));
+      new gdata::CreateDirectoryOperation(operation_registry(), callback,
+                                          parent_content_url, directory_name));
 }
 
 void GDataWapiService::CopyDocument(const std::string& resource_id,
                                     const FilePath::StringType& new_name,
-                                    const GetDataCallback& callback) {
+                                    const gdata::GetDataCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   runner_->StartOperationWithRetry(
-      new CopyDocumentOperation(operation_registry(), callback,
-                                resource_id, new_name));
+      new gdata::CopyDocumentOperation(operation_registry(), callback,
+                                       resource_id, new_name));
 }
 
-void GDataWapiService::RenameResource(const GURL& resource_url,
-                                      const FilePath::StringType& new_name,
-                                      const EntryActionCallback& callback) {
+void GDataWapiService::RenameResource(
+    const GURL& resource_url,
+    const FilePath::StringType& new_name,
+    const gdata::EntryActionCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   runner_->StartOperationWithRetry(
-      new RenameResourceOperation(operation_registry(), callback,
-                                  resource_url, new_name));
+      new gdata::RenameResourceOperation(operation_registry(), callback,
+                                         resource_url, new_name));
 }
 
 void GDataWapiService::AddResourceToDirectory(
     const GURL& parent_content_url,
     const GURL& resource_url,
-    const EntryActionCallback& callback) {
+    const gdata::EntryActionCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   runner_->StartOperationWithRetry(
-      new AddResourceToDirectoryOperation(operation_registry(),
-                                          callback,
-                                          parent_content_url,
-                                          resource_url));
+      new gdata::AddResourceToDirectoryOperation(operation_registry(),
+                                                 callback,
+                                                 parent_content_url,
+                                                 resource_url));
 }
 
 void GDataWapiService::RemoveResourceFromDirectory(
     const GURL& parent_content_url,
     const GURL& resource_url,
     const std::string& resource_id,
-    const EntryActionCallback& callback) {
+    const gdata::EntryActionCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   runner_->StartOperationWithRetry(
-      new RemoveResourceFromDirectoryOperation(operation_registry(),
-                                               callback,
-                                               parent_content_url,
-                                               resource_url,
-                                               resource_id));
+      new gdata::RemoveResourceFromDirectoryOperation(operation_registry(),
+                                                      callback,
+                                                      parent_content_url,
+                                                      resource_url,
+                                                      resource_id));
 }
 
-void GDataWapiService::InitiateUpload(const InitiateUploadParams& params,
-                                      const InitiateUploadCallback& callback) {
+void GDataWapiService::InitiateUpload(
+    const gdata::InitiateUploadParams& params,
+    const gdata::InitiateUploadCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (params.upload_location.is_empty()) {
     if (!callback.is_null())
-      callback.Run(HTTP_BAD_REQUEST, GURL());
+      callback.Run(gdata::HTTP_BAD_REQUEST, GURL());
     return;
   }
 
   runner_->StartOperationWithRetry(
-      new InitiateUploadOperation(operation_registry(), callback, params));
+      new gdata::InitiateUploadOperation(
+          operation_registry(), callback, params));
 }
 
-void GDataWapiService::ResumeUpload(const ResumeUploadParams& params,
-                                    const ResumeUploadCallback& callback) {
+void GDataWapiService::ResumeUpload(
+    const gdata::ResumeUploadParams& params,
+    const gdata::ResumeUploadCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   runner_->StartOperationWithRetry(
-      new ResumeUploadOperation(operation_registry(), callback, params));
+      new gdata::ResumeUploadOperation(
+          operation_registry(), callback, params));
 }
 
 void GDataWapiService::AuthorizeApp(const GURL& resource_url,
                                     const std::string& app_ids,
-                                    const GetDataCallback& callback) {
+                                    const gdata::GetDataCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   runner_->StartOperationWithRetry(
-      new AuthorizeAppsOperation(operation_registry(), callback,
-                                 resource_url, app_ids));
+      new gdata::AuthorizeAppsOperation(operation_registry(), callback,
+                                        resource_url, app_ids));
 }
 
 bool GDataWapiService::HasAccessToken() const {
@@ -321,7 +331,7 @@ bool GDataWapiService::HasRefreshToken() const {
   return runner_->auth_service()->HasRefreshToken();
 }
 
-OperationRegistry* GDataWapiService::operation_registry() const {
+gdata::OperationRegistry* GDataWapiService::operation_registry() const {
   return runner_->operation_registry();
 }
 
@@ -334,16 +344,16 @@ void GDataWapiService::OnOAuth2RefreshTokenChanged() {
 }
 
 void GDataWapiService::OnProgressUpdate(
-    const OperationProgressStatusList& list) {
+    const gdata::OperationProgressStatusList& list) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   FOR_EACH_OBSERVER(
       DriveServiceObserver, observers_, OnProgressUpdate(list));
 }
 
-void GDataWapiService::OnAuthenticationFailed(GDataErrorCode error) {
+void GDataWapiService::OnAuthenticationFailed(gdata::GDataErrorCode error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   FOR_EACH_OBSERVER(
       DriveServiceObserver, observers_, OnAuthenticationFailed(error));
 }
 
-}  // namespace gdata
+}  // namespace drive