Rename DocumentsServiceInterface to DriveServiceInterface.

chrome/browser/chromeos/gdata/gdata_uploader.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/chromeos/gdata/gdata_uploader.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
-#include "chrome/browser/chromeos/gdata/documents_service_interface.h"
+#include "chrome/browser/chromeos/gdata/drive_service_interface.h"
 #include "chrome/browser/chromeos/gdata/gdata_directory_service.h"
 #include "chrome/browser/chromeos/gdata/gdata_upload_file_info.h"
 #include "chrome/browser/chromeos/gdata/gdata_wapi_parser.h"
+#include "chrome/browser/chromeos/gdata/gdata_wapi_service.h"

[kochi, 2012/08/21 02:34:51]

Looks like an unnecessary header file sneaked in. Removed.

 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_item.h"
 #include "net/base/file_stream.h"
 #include "net/base/net_errors.h"
 
 using content::BrowserThread;
 
 namespace {
 
 // Google Documents List API requires uploading in chunks of 512kB.
 const int64 kUploadChunkSize = 512 * 1024;
 
 // Maximum number of times we try to open a file before giving up.
 const int kMaxFileOpenTries = 5;
 
 }  // namespace
 
 namespace gdata {
 
-GDataUploader::GDataUploader(DocumentsServiceInterface* documents_service)
-  : documents_service_(documents_service),
+GDataUploader::GDataUploader(DriveServiceInterface* drive_service)
+  : drive_service_(drive_service),
     next_upload_id_(0),
     ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
 }
 
 GDataUploader::~GDataUploader() {
 }
 
 int GDataUploader::UploadNewFile(scoped_ptr<UploadFileInfo> upload_file_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(upload_file_info.get());
@@ skipping 187 matching lines @@
     return;
   }
 
   // Open succeeded, initiate the upload.
   upload_file_info->should_retry_file_open = false;
   if (upload_file_info->initial_upload_location.is_empty()) {
     UploadFailed(scoped_ptr<UploadFileInfo>(upload_file_info),
                  GDATA_FILE_ERROR_ABORT);
     return;
   }
-  documents_service_->InitiateUpload(
+  drive_service_->InitiateUpload(
       InitiateUploadParams(upload_file_info->upload_mode,
                            upload_file_info->title,
                            upload_file_info->content_type,
                            upload_file_info->content_length,
                            upload_file_info->initial_upload_location,
                            upload_file_info->gdata_path),
       base::Bind(&GDataUploader::OnUploadLocationReceived,
                  weak_ptr_factory_.GetWeakPtr(),
                  upload_file_info->upload_id));
 }
@@ skipping 105 matching lines @@
                                 bytes_read - 1;
 
   ResumeUpload(upload_id);
 }
 
 void GDataUploader::ResumeUpload(int upload_id) {
   UploadFileInfo* upload_file_info = GetUploadFileInfo(upload_id);
   if (!upload_file_info)
     return;
 
-  documents_service_->ResumeUpload(
+  drive_service_->ResumeUpload(
       ResumeUploadParams(upload_file_info->upload_mode,
                          upload_file_info->start_range,
                          upload_file_info->end_range,
                          upload_file_info->content_length,
                          upload_file_info->content_type,
                          upload_file_info->buf,
                          upload_file_info->upload_location,
                          upload_file_info->gdata_path),
       base::Bind(&GDataUploader::OnResumeUploadResponseReceived,
                  weak_ptr_factory_.GetWeakPtr(),
@@ skipping 73 matching lines @@
   if (!callback.is_null())
     callback.Run(error, upload_file_info.Pass());
 }
 
 void GDataUploader::RemoveUpload(int upload_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   pending_uploads_.erase(upload_id);
 }
 
 }  // namespace gdata