Drive: Move inner structures of DriveAPIService under drive namespace.

chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.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_service_helper.h"
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 67 matching lines @@
     return error;
   return google_apis::HTTP_CREATED;
 }
 
 DriveApiErrorCode FakeDriveServiceHelper::AddFolder(
     const std::string& parent_folder_id,
     const std::string& title,
     std::string* folder_id) {
   DriveApiErrorCode error = google_apis::DRIVE_OTHER_ERROR;
   scoped_ptr<FileResource> folder;
-  fake_drive_service_->AddNewDirectory(
-      parent_folder_id, title,
-      drive::DriveServiceInterface::AddNewDirectoryOptions(),
-      CreateResultReceiver(&error, &folder));
+  fake_drive_service_->AddNewDirectory(parent_folder_id, title,
+                                       drive::AddNewDirectoryOptions(),
+                                       CreateResultReceiver(&error, &folder));
   base::RunLoop().RunUntilIdle();
 
   if (error == google_apis::HTTP_CREATED && folder_id)
     *folder_id = folder->file_id();
   return error;
 }
 
 DriveApiErrorCode FakeDriveServiceHelper::AddFile(
     const std::string& parent_folder_id,
     const std::string& title,
     const std::string& content,
     std::string* file_id) {
   base::FilePath temp_file = WriteToTempFile(content);
 
   DriveApiErrorCode error = google_apis::DRIVE_OTHER_ERROR;
   scoped_ptr<FileResource> file;
   drive_uploader_->UploadNewFile(
-      parent_folder_id, temp_file, title,
-      "application/octet-stream",
-      drive::DriveUploader::UploadNewFileOptions(),
+      parent_folder_id, temp_file, title, "application/octet-stream",
+      drive::UploadNewFileOptions(),
       base::Bind(&UploadResultCallback, &error, &file),
       google_apis::ProgressCallback());
   base::RunLoop().RunUntilIdle();
 
   if (error == google_apis::HTTP_SUCCESS && file_id)
     *file_id = file->file_id();
   return error;
 }
 
 DriveApiErrorCode FakeDriveServiceHelper::UpdateFile(
     const std::string& file_id,
     const std::string& content) {
   base::FilePath temp_file = WriteToTempFile(content);
   DriveApiErrorCode error = google_apis::DRIVE_OTHER_ERROR;
   scoped_ptr<FileResource> file;
   drive_uploader_->UploadExistingFile(
-      file_id, temp_file,
-      "application/octet-stream",
-      drive::DriveUploader::UploadExistingFileOptions(),
+      file_id, temp_file, "application/octet-stream",
+      drive::UploadExistingFileOptions(),
       base::Bind(&UploadResultCallback, &error, &file),
       google_apis::ProgressCallback());
   base::RunLoop().RunUntilIdle();
   return error;
 }
 
 DriveApiErrorCode FakeDriveServiceHelper::DeleteResource(
     const std::string& file_id) {
   DriveApiErrorCode error = google_apis::DRIVE_OTHER_ERROR;
   fake_drive_service_->DeleteResource(
@@ skipping 202 matching lines @@
     const std::string& content) {
   base::FilePath temp_file;
   EXPECT_TRUE(base::CreateTemporaryFileInDir(temp_dir_, &temp_file));
   EXPECT_EQ(static_cast<int>(content.size()),
             base::WriteFile(temp_file, content.data(), content.size()));
   return temp_file;
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system