Drive: Move inner structures of DriveAPIService under drive namespace.

chrome/browser/chromeos/drive/job_scheduler.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_JOB_SCHEDULER_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_JOB_SCHEDULER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 141 matching lines @@
                               const google_apis::EntryActionCallback& callback);
 
   // Adds a RemoveResourceFromDirectory operation to the queue.
   void RemoveResourceFromDirectory(
       const std::string& parent_resource_id,
       const std::string& resource_id,
       const ClientContext& context,
       const google_apis::EntryActionCallback& callback);
 
   // Adds a AddNewDirectory operation to the queue.
-  void AddNewDirectory(
-      const std::string& parent_resource_id,
-      const std::string& directory_title,
-      const DriveServiceInterface::AddNewDirectoryOptions& options,
-      const ClientContext& context,
-      const google_apis::FileResourceCallback& callback);
+  void AddNewDirectory(const std::string& parent_resource_id,
+                       const std::string& directory_title,
+                       const AddNewDirectoryOptions& options,
+                       const ClientContext& context,
+                       const google_apis::FileResourceCallback& callback);
 
   // Adds a DownloadFile operation to the queue.
   // The first two arguments |virtual_path| and |expected_file_size| are used
   // only for filling JobInfo for the operation so that observers can get the
   // detail. The actual operation never refers these values.
   JobID DownloadFile(
       const base::FilePath& virtual_path,
       int64 expected_file_size,
       const base::FilePath& local_cache_path,
       const std::string& resource_id,
       const ClientContext& context,
       const google_apis::DownloadActionCallback& download_action_callback,
       const google_apis::GetContentCallback& get_content_callback);
 
   // Adds an UploadNewFile operation to the queue.
   void UploadNewFile(const std::string& parent_resource_id,
                      const base::FilePath& drive_file_path,
                      const base::FilePath& local_file_path,
                      const std::string& title,
                      const std::string& content_type,
-                     const DriveUploader::UploadNewFileOptions& options,
+                     const UploadNewFileOptions& options,
                      const ClientContext& context,
                      const google_apis::FileResourceCallback& callback);
 
   // Adds an UploadExistingFile operation to the queue.
-  void UploadExistingFile(
-      const std::string& resource_id,
-      const base::FilePath& drive_file_path,
-      const base::FilePath& local_file_path,
-      const std::string& content_type,
-      const DriveUploader::UploadExistingFileOptions& options,
-      const ClientContext& context,
-      const google_apis::FileResourceCallback& callback);
+  void UploadExistingFile(const std::string& resource_id,
+                          const base::FilePath& drive_file_path,
+                          const base::FilePath& local_file_path,
+                          const std::string& content_type,
+                          const UploadExistingFileOptions& options,
+                          const ClientContext& context,
+                          const google_apis::FileResourceCallback& callback);
 
   // Adds AddPermission operation to the queue. |callback| must not be null.
   void AddPermission(const std::string& resource_id,
                      const std::string& email,
                      google_apis::drive::PermissionRole role,
                      const google_apis::EntryActionCallback& callback);
 
  private:
   friend class JobSchedulerTest;
 
@@ skipping 191 matching lines @@
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<JobScheduler> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(JobScheduler);
 };
 
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_JOB_SCHEDULER_H_