Drive: Move inner structures of DriveAPIService under drive namespace.

chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.cc

 // Copyright 2014 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/sync_file_system/drive_backend/fake_drive_uploader.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 49 matching lines @@
 }  // namespace
 
 FakeDriveServiceWrapper::FakeDriveServiceWrapper()
   : make_directory_conflict_(false) {}
 
 FakeDriveServiceWrapper::~FakeDriveServiceWrapper() {}
 
 CancelCallback FakeDriveServiceWrapper::AddNewDirectory(
     const std::string& parent_resource_id,
     const std::string& directory_name,
-    const AddNewDirectoryOptions& options,
+    const drive::AddNewDirectoryOptions& options,
     const FileResourceCallback& callback) {
   if (make_directory_conflict_) {
     FakeDriveService::AddNewDirectory(
         parent_resource_id,
         directory_name,
         options,
         base::Bind(&DidAddFileOrDirectoryForMakingConflict));
   }
   return FakeDriveService::AddNewDirectory(
       parent_resource_id, directory_name, options, callback);
 }
 
 FakeDriveUploader::FakeDriveUploader(
     FakeDriveServiceWrapper* fake_drive_service)
     : fake_drive_service_(fake_drive_service),
       make_file_conflict_(false) {}
 
 FakeDriveUploader::~FakeDriveUploader() {}
 
 CancelCallback FakeDriveUploader::UploadNewFile(
     const std::string& parent_resource_id,
     const base::FilePath& local_file_path,
     const std::string& title,
     const std::string& content_type,
-    const UploadNewFileOptions& options,
+    const drive::UploadNewFileOptions& options,
     const UploadCompletionCallback& callback,
     const ProgressCallback& progress_callback) {
   DCHECK(!callback.is_null());
   const std::string kFileContent = "test content";
 
   if (make_file_conflict_) {
     fake_drive_service_->AddNewFile(
         content_type,
         kFileContent,
         parent_resource_id,
@@ skipping 11 matching lines @@
       base::Bind(&DidAddFileForUploadNew, callback));
   base::MessageLoop::current()->RunUntilIdle();
 
   return CancelCallback();
 }
 
 CancelCallback FakeDriveUploader::UploadExistingFile(
     const std::string& resource_id,
     const base::FilePath& local_file_path,
     const std::string& content_type,
-    const UploadExistingFileOptions& options,
+    const drive::UploadExistingFileOptions& options,
     const UploadCompletionCallback& callback,
     const ProgressCallback& progress_callback) {
   DCHECK(!callback.is_null());
   return fake_drive_service_->GetFileResource(
       resource_id,
       base::Bind(&DidGetFileResourceForUploadExisting, callback));
 }
 
 CancelCallback FakeDriveUploader::ResumeUploadFile(
     const GURL& upload_location,
     const base::FilePath& local_file_path,
     const std::string& content_type,
-    const UploadCompletionCallback& callback,
+    const drive::UploadCompletionCallback& callback,
     const ProgressCallback& progress_callback) {
   // At the moment, sync file system doesn't support resuming of the uploading.
   // So this method shouldn't be reached.
   NOTREACHED();
   return CancelCallback();
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system