google_apis: Introduce GDataWapiUrlGenerator class

chrome/browser/google_apis/gdata_wapi_service.cc

 // 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.
 
 #include "chrome/browser/google_apis/gdata_wapi_service.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/message_loop_proxy.h"
 #include "chrome/browser/google_apis/auth_service.h"
 #include "chrome/browser/google_apis/gdata_wapi_operations.h"
+#include "chrome/browser/google_apis/gdata_wapi_url_util.h"
 #include "chrome/browser/google_apis/operation_runner.h"
 #include "chrome/browser/google_apis/time_util.h"
 #include "chrome/common/net/url_util.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace google_apis {
 
 namespace {
@@ skipping 35 matching lines @@
 
 // OAuth2 scopes for the documents API.
 const char kDocsListScope[] = "https://docs.google.com/feeds/";
 const char kSpreadsheetsScope[] = "https://spreadsheets.google.com/feeds/";
 const char kUserContentScope[] = "https://docs.googleusercontent.com/";
 const char kDriveAppsScope[] = "https://www.googleapis.com/auth/drive.apps";
 
 }  // namespace
 
 GDataWapiService::GDataWapiService()
-    : runner_(NULL) {
+    : runner_(NULL),
+      url_generator_(gdata_wapi_url_util::kBaseUrlForProduction) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 GDataWapiService::~GDataWapiService() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (runner_.get()) {
     runner_->operation_registry()->RemoveObserver(this);
     runner_->auth_service()->RemoveObserver(this);
   }
 }
@@ skipping 59 matching lines @@
     bool shared_with_me,
     const std::string& directory_resource_id,
     const 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 google_apis::GetDocumentsOperation(
           operation_registry(),
+          url_generator_,
           url,
           static_cast<int>(start_changestamp),
           search_query,
           shared_with_me,
           directory_resource_id,
           callback);
   runner_->StartOperationWithRetry(operation);
 }
 
 void GDataWapiService::GetDocumentEntry(
     const std::string& resource_id,
     const GetDataCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   GetDocumentEntryOperation* operation =
       new GetDocumentEntryOperation(operation_registry(),
+                                    url_generator_,
                                     resource_id,
                                     callback);
   runner_->StartOperationWithRetry(operation);
 }
 
 void GDataWapiService::GetAccountMetadata(const GetDataCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   GetAccountMetadataOperation* operation =
       new GetAccountMetadataOperation(
-          operation_registry(), callback);
+          operation_registry(), url_generator_, callback);
   runner_->StartOperationWithRetry(operation);
 }
 
 void GDataWapiService::GetApplicationInfo(
     const GetDataCallback& callback) {
   // For WAPI, AccountMetadata includes Drive application information.
   GetAccountMetadata(callback);
 }
 
 void GDataWapiService::DownloadDocument(
@@ skipping 39 matching lines @@
                                   document_url));
 }
 
 void GDataWapiService::AddNewDirectory(
     const GURL& parent_content_url,
     const FilePath::StringType& directory_name,
     const GetDataCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   runner_->StartOperationWithRetry(
       new CreateDirectoryOperation(

[hashimoto, 2012/11/20 09:10:17]

nit: Can't we save one newline here?

[satorux1, 2012/11/21 00:34:18]

Done.

-          operation_registry(), callback, parent_content_url, directory_name));
+          operation_registry(),
+          url_generator_,
+          callback,
+          parent_content_url,
+          directory_name));
 }
 
 void GDataWapiService::CopyDocument(
     const std::string& resource_id,
     const FilePath::StringType& new_name,
     const GetDataCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   runner_->StartOperationWithRetry(
-      new CopyDocumentOperation(operation_registry(), callback,
-                                resource_id, new_name));
+      new CopyDocumentOperation(operation_registry(),
+                                url_generator_,
+                                callback,
+                                resource_id,
+                                new_name));
 }
 
 void GDataWapiService::RenameResource(
     const GURL& resource_url,
     const FilePath::StringType& new_name,
     const EntryActionCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   runner_->StartOperationWithRetry(
       new RenameResourceOperation(operation_registry(), callback,
                                   resource_url, new_name));
 }
 
 void GDataWapiService::AddResourceToDirectory(
     const GURL& parent_content_url,
     const GURL& resource_url,
     const EntryActionCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   runner_->StartOperationWithRetry(
       new AddResourceToDirectoryOperation(operation_registry(),
+                                          url_generator_,
                                           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) {
@@ skipping 74 matching lines @@
       DriveServiceObserver, observers_, OnProgressUpdate(list));
 }
 
 void GDataWapiService::OnAuthenticationFailed(GDataErrorCode error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   FOR_EACH_OBSERVER(
       DriveServiceObserver, observers_, OnAuthenticationFailed(error));
 }
 
 }  // namespace google_apis